From 231c64ecdf11280c8c7c2342462b7682ce8214fc Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Mon, 12 Mar 2012 18:42:33 -0400
Subject: v3dv: texinfo, fix (break holding back 3.2 merge)

* proposed next version starts 3.2, (merge dev branch after 3.1.15)
---
 lib/sisu/v3dv/texinfo.rb | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'lib/sisu/v3dv/texinfo.rb')

diff --git a/lib/sisu/v3dv/texinfo.rb b/lib/sisu/v3dv/texinfo.rb
index 145712e1..2496ce7a 100644
--- a/lib/sisu/v3dv/texinfo.rb
+++ b/lib/sisu/v3dv/texinfo.rb
@@ -140,11 +140,10 @@ module SiSU_TexInfo
         data=@data
         data=pre(data)
         data=endnote(data)
-        data=markup(data)
-        objects=tail(data)
-        #output(objects)
-        output(@tex_file)
-        #output(data.compact)
+        data,head=markup(data)
+        objs_txt=tail(data)
+        doc_txt=[head,objs_txt]
+        output(doc_txt)
         makeinfo #KEEP reinstate when fixed #%
         place_info
       rescue; STDERR.puts SiSU_Screen::Ansi.new(@md.opt.cmd,$!,$@).rescue
@@ -340,14 +339,9 @@ module SiSU_TexInfo
         end
         #%case with endnotes
         dob.obj=dob.obj.gsub(/\s*[0-8]\\+(\S+)?\s+/,' ') if dob.obj
-        if dob.obj \
-        && (dob.is !=:structure \
-        && dob.is !=:comment)
-          @tex_file << dob.obj
-        end
         data_new << dob
       end
-      data_new
+      [data_new, @tex_file]
     end
     def number_titles
       data,data_new=@data,[]
@@ -376,12 +370,16 @@ module SiSU_TexInfo
     end
     def tail(data)
       tex=SiSU_TexInfoFormat::Texinfo.new(@md)
-      objects=[]
+      objs_txt=[]
       data.each do |dob|
-         objects << dob.obj if dob.obj
+        if dob.obj \
+        && (dob.is !=:structure \
+        && dob.is !=:comment)
+           objs_txt << dob.obj if dob.obj
+        end
       end
-      objects << tex.dublincore << tex.tail
-      objects
+      objs_txt << tex.dublincore << tex.tail
+      objs_txt
     end
     def output(data)
       filename_texinfo=%{#{@env.processing_path.texi}/#{@md.fnb}.texinfo}
-- 
cgit v1.2.3