diff options
Diffstat (limited to 'lib/sisu/v0/texpdf_format.rb')
| -rw-r--r-- | lib/sisu/v0/texpdf_format.rb | 318 | 
1 files changed, 175 insertions, 143 deletions
| diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb index f776dd5a..55a9473f 100644 --- a/lib/sisu/v0/texpdf_format.rb +++ b/lib/sisu/v0/texpdf_format.rb @@ -78,8 +78,24 @@ module SiSU_TeX_Pdf      }      @@sys=SiSU_Env::System_call.new      @@dp=nil -    def initialize(md,string,string1=nil) -      @md,@string,@string1=md,string,string1 +    def initialize(md,t_o) +      @md,@t_o=md,t_o +      if t_o.class == Hash +        @txt =t_o[:txt]            || nil +        @title =t_o[:title]        || nil +        @subtitle =t_o[:subtitle]  || nil +        @ps =t_o[:paper_size]      || nil +        @ocn =t_o[:ocn]            || nil +        @words =t_o[:words]        || nil +      #elsif t_o.class == Array +      #  @txt =txt[0] +      #elsif t_o.class == String +      #  @txt =txt +      else +        p t_o.class +        p caller +      end +        if defined? @md.image \        and @md.image =~/center/          @center_begin,@center_end='\begin{center}','\end{center}' @@ -90,12 +106,11 @@ module SiSU_TeX_Pdf        @tx=SiSU_Env::Get_init.instance.tex        @url_brace=SiSU_Viz::Skin.new.url_decoration        @tex2pdf=@@tex3pdf ||=SiSU_Env::System_call.new.tex2pdf_engine -      @ps=string1 if string1=~/(?:a4|letter|legal|book|a5|b5)/i      end      def longtable_landscape        @end_table='\end{longtable}'        @row_break='\\\\\\' -      if @string[/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c(\d+);(.+?)#{Mx[:tc_p]}\\~(\d+;\w\d+;\w\d+)#{Mx[:gr_c]}/u] +      if @txt[/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c(\d+);(.+?)#{Mx[:tc_p]}\\~(\d+;\w\d+;\w\d+)#{Mx[:gr_c]}/u]          no_of_cols,cols_width,ocn=$1,$2,$3          tw=case @ps          when /a4/i;      @tx.a4.landscape.w     #European default, SiSU default @@ -106,7 +121,7 @@ module SiSU_TeX_Pdf          else             @tx.a4.landscape.w     #default currently A4          end          textwidth=(tw.to_i/2) - 24 -        @@tableheader[@ps][:l]=1 if @string =~/#{Mx[:gr_o]}Th/ +        @@tableheader[@ps][:l]=1 if @txt =~/#{Mx[:gr_o]}Th/          w=cols_width.split(/;\s*/)          @@number_of_cols=no_of_cols ||=@@number_of_cols          #@@number_of_cols=0 unless @@number_of_cols.to_i > 0 @@ -122,36 +137,36 @@ module SiSU_TeX_Pdf          @colW=@colW.join          @start_table="#{Mx[:id_o]}~#{ocn}#{Mx[:id_c]}\n\\setlength{\\LTleft}{0pt}\n\\setlength{\\LTright}{\\fill}\n" +            "\\begin{tiny}\n\\begin{longtable}#@colW\n" -        @string.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c\d+?;.+#{Mx[:tc_p]}\\~\d+;\w\d+;\w\d+#{Mx[:gr_c]}/u,@start_table) +        @txt.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c\d+?;.+#{Mx[:tc_p]}\\~\d+;\w\d+;\w\d+#{Mx[:gr_c]}/u,@start_table)        end -      if @string =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ -        @string.gsub!(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/," #@end_table\n\\end{tiny}") +      if @txt =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ +        @txt.gsub!(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/," #@end_table\n\\end{tiny}")        end -      @string.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}/u,'') +      @txt.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}/u,'')        if @@tableheader[@ps][:l] == 1 -        if @string =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_p]})/u -          tablefoot=@string[/\<!f(.+?)!\>/,1] -          @string.gsub!(/\<!f(.+?)!\>/,'') -          @string.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u,'\bfseries \1&') -          @string.gsub!(/&\s*$/," #@row_break \\hline\\endhead #@row_break") -          @string="#@string \\multicolumn{#{@@number_of_cols}}{l}{\\tiny #{tablefoot}} \\\\ \\hline\n\\endfoot\n\\hline\n" if tablefoot +        if @txt =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_p]})/u +          tablefoot=@txt[/\<!f(.+?)!\>/,1] +          @txt.gsub!(/\<!f(.+?)!\>/,'') +          @txt.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u,'\bfseries \1&') +          @txt.gsub!(/&\s*$/," #@row_break \\hline\\endhead #@row_break") +          @txt="#@txt \\multicolumn{#{@@number_of_cols}}{l}{\\tiny #{tablefoot}} \\\\ \\hline\n\\endfoot\n\\hline\n" if tablefoot            @@tableheader[@ps][:l]=0            #@@tableheader[@ps][:l],@@number_of_cols=0,0          end        else -        if @string =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u -          @string.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|!)/u,'\1&') -          @string.gsub!(/&\s*$/," #@row_break") +        if @txt =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u +          @txt.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|!)/u,'\1&') +          @txt.gsub!(/&\s*$/," #@row_break")          end        end -      @string=if ocn; "#{Mx[:id_o]}~#{ocn}#{Mx[:id_c]}" + @string -      else @string +      @txt=if ocn; "#{Mx[:id_o]}~#{ocn}#{Mx[:id_c]}" + @txt +      else @txt        end      end      def longtable_portrait        @end_table='\end{longtable}'        @row_break='\\\\\\' -      if @string[/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c(\d+);(.+?)#{Mx[:tc_p]}\\~(\d+;\w\d+;\w\d+)#{Mx[:gr_c]}/u] +      if @txt[/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c(\d+);(.+?)#{Mx[:tc_p]}\\~(\d+;\w\d+;\w\d+)#{Mx[:gr_c]}/u]          no_of_cols,cols_width,ocn=$1,$2,$3          tw=case @ps          when /a4/i;      @tx.a4.portrait.w     #European default, SiSU default @@ -162,7 +177,7 @@ module SiSU_TeX_Pdf          else             @tx.a4.portrait.w     #default currently A4          end          textwidth=tw.to_i - 20 -        @@tableheader[@ps][:p]=1 if @string =~/#{Mx[:gr_o]}Th/ +        @@tableheader[@ps][:p]=1 if @txt =~/#{Mx[:gr_o]}Th/          w=cols_width.split(/;\s*/)          @@number_of_cols=no_of_cols ||=@@number_of_cols          @colW=[] @@ -178,30 +193,30 @@ module SiSU_TeX_Pdf          @colW=@colW.join          @start_table="#{Mx[:id_o]}~#{ocn}#{Mx[:id_c]}\n\\setlength{\\LTleft}{0pt}\n\\setlength{\\LTright}{\\fill}\n" +            "\\begin{tiny}\n\\begin{longtable}#@colW\n" -        @string.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c\d+?;.+#{Mx[:tc_p]}\\~\d+;\w\d+;\w\d+#{Mx[:gr_c]}/u,"#@start_table") +        @txt.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c\d+?;.+#{Mx[:tc_p]}\\~\d+;\w\d+;\w\d+#{Mx[:gr_c]}/u,"#@start_table")        end -      if @string =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ -        @string.gsub!(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/," #@end_table\n\\end{tiny}") +      if @txt =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ +        @txt.gsub!(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/," #@end_table\n\\end{tiny}")        end -      @string.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}/u,'') +      @txt.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}/u,'')        if @@tableheader[@ps][:p] == 1 -        if @string =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|!)/u -          tablefoot=@string[/\<!f(.+?)!\>/,1] -          @string.gsub!(/\<!f(.+?)!\>/,'') -          @string.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u,'\bfseries \1&') -          @string.gsub!(/&\s*$/," #@row_break \\hline\\endhead #@row_break") -          @string="#@string \\multicolumn{#{@@number_of_cols}}{l}{\\tiny #{tablefoot}} \\\\ \\hline\n\\endfoot\n\\hline\n" if tablefoot +        if @txt =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|!)/u +          tablefoot=@txt[/\<!f(.+?)!\>/,1] +          @txt.gsub!(/\<!f(.+?)!\>/,'') +          @txt.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u,'\bfseries \1&') +          @txt.gsub!(/&\s*$/," #@row_break \\hline\\endhead #@row_break") +          @txt="#@txt \\multicolumn{#{@@number_of_cols}}{l}{\\tiny #{tablefoot}} \\\\ \\hline\n\\endfoot\n\\hline\n" if tablefoot            @@tableheader[@ps][:p]=0            #@@tableheader[@ps][:p],@@number_of_cols=0,0          end        else -        if @string =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u -          @string.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u,'\1&') -          @string.gsub!(/&\s*$/," #@row_break") +        if @txt =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u +          @txt.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_c]})/u,'\1&') +          @txt.gsub!(/&\s*$/," #@row_break")          end        end -      @string=if ocn; "#{Mx[:id_o]}~#{ocn}#{Mx[:id_c]}" + @string -      else @string +      @txt=if ocn; "#{Mx[:id_o]}~#{ocn}#{Mx[:id_c]}" + @txt +      else @txt        end      end      def scopedtable @@ -210,7 +225,7 @@ module SiSU_TeX_Pdf        @end_table="\\end{tabular}"        @row_break='\\\\\\\\'        @break_page="#@row_break\n#@row_break \n" -      if @string[/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c(\d+);(.+?)#{Mx[:gr_c]}/u] +      if @txt[/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c(\d+);(.+?)#{Mx[:gr_c]}/u]          no_of_cols,cols_width=$1,$2          @w=cols_width.split(/;\s*/)          @colW=[] @@ -219,28 +234,28 @@ module SiSU_TeX_Pdf            @colW << "p{#{col_w}cm}" if col_w          end          @start_table="\\begin{tabular}{#@colW}\n" -        @string.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c\d+?;.+#{Mx[:gr_c]}/u,"#@start_table}") +        @txt.gsub!(/#{Mx[:gr_o]}Th?#{Mx[:tc_p]}\s+c\d+?;.+#{Mx[:gr_c]}/u,"#@start_table}")        end -      if @string =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ -        @string.gsub!(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/,"#@end_table") +      if @txt =~/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/ +        @txt.gsub!(/#{Mx[:gr_o]}TZ#{Mx[:gr_c]}/,"#@end_table")          @@table_pg_break_counter=1        end -      if @string =~/#{Mx[:tc_o]}#{Mx[:tc_p]}/u +      if @txt =~/#{Mx[:tc_o]}#{Mx[:tc_p]}/u          if @@table_pg_break_counter == 28 # taken from 34 ideal for portrait to 28 which suits landscape -          @string="\n\n#@end_table \n#@break_page#@start_table\n" +          @txt="\n\n#@end_table \n#@break_page#@start_table\n"            @@table_pg_break_counter=1          else -          @string.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}/u,'') +          @txt.gsub!(/#{Mx[:tc_o]}#{Mx[:tc_p]}/u,'')            @@table_pg_break_counter+=1 -          tablefoot=@string[/\<!f(.+?)!\>/,1] -          @string.gsub!(/\<!f(.+?)!\>/,'') +          tablefoot=@txt[/\<!f(.+?)!\>/,1] +          @txt.gsub!(/\<!f(.+?)!\>/,'')          end        end -      if @string =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_p]})/u -        @string.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_p]})/u,"\\1&") -        @string.gsub!(/&\s*$/,"#@row_break") +      if @txt =~/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_p]})/u +        @txt.gsub!(/#{Mx[:tc_p]}\d+?#{Mx[:tc_p]}(.+?)(?:#{Mx[:tc_p]}|#{Mx[:tc_p]})/u,"\\1&") +        @txt.gsub!(/&\s*$/,"#@row_break")        end -      @string +      @txt      end      def heading_major(para,lev) #\emph{        title=@md.title @@ -264,90 +279,90 @@ module SiSU_TeX_Pdf  para      end      def level1 -      heading_major(@string,1) +      heading_major(@txt,1)      end      def level2 -      heading_major(@string,2) +      heading_major(@txt,2)      end      def level3 -      heading_major(@string,3) +      heading_major(@txt,3)      end      def level4 -      @string.strip! if @string -      @string.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') -      cont_ln=@string.dup +      @txt.strip! if @txt +      @txt.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') +      cont_ln=@txt.dup        cont_ln.gsub!(@@tex_pattern_margin_number,'')        cont_ln.gsub!(/#{@@tex_backslash*2}/,"#{@@tex_backslash*4}") # added w42        cont_ln.gsub!(/#{Mx[:lv_o]}4:\S+?#{Mx[:lv_c]}\s*/,'')        cont_ln.gsub!(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22        cont_ln.gsub!(/\\Footnote[A]\{[*+]+\d*\}\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22        title=@md.title -      @string.gsub!(/#{@md.lv4}\s+(#{@md.lv4})/m,'\1') -      if @string =~/#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|<:4-endnotes>/ +      @txt.gsub!(/#{@md.lv4}\s+(#{@md.lv4})/m,'\1') +      if @txt =~/#{Mx[:lv_o]}4:endnotes#{Mx[:lv_c]}|<:4-endnotes>/          # watch exclusion removes endnotes marker from pdf 2003w03 -        @string.gsub!(/.+/m,'') +        @txt.gsub!(/.+/m,'')        end -      if @string =~/\\footnote/ #and para =~/^[1-6]#{@@tilde}/ # removing footnotes from headings! +      if @txt =~/\\footnote/ #and para =~/^[1-6]#{@@tilde}/ # removing footnotes from headings!          cont_ln.gsub!(/\s*\\footnote\[\d+\]\{%\n .+? \}\s*/,' ')          cont_ln.gsub!(/\s*\\Footnote[A]\{[*+]+\d*\}\{%\n .+? \}\s*/,' ')        end -      if @string !~/#{Mx[:lv_o]}4:/ -        @string.gsub!(/(#{@md.lv4}.*)\n?$/m,"\\subsubsection*{\\1} +      if @txt !~/#{Mx[:lv_o]}4:/ +        @txt.gsub!(/(#{@md.lv4}.*)\n?$/m,"\\subsubsection*{\\1}  \\addcontentsline{toc}{subsection}{#{cont_ln}}  \\markright{#{title}}")        else -        @string.gsub!(/^\s*#{Mx[:lv_o]}4:\S+?#{Mx[:lv_c]}\s*(.*)?\n?$/m,"\\subsubsection*{\\1} +        @txt.gsub!(/^\s*#{Mx[:lv_o]}4:\S+?#{Mx[:lv_c]}\s*(.*)?\n?$/m,"\\subsubsection*{\\1}  \\addcontentsline{toc}{subsection}{#{cont_ln}}  \\markright{#{title}}")        end -      @string.gsub!(/#{@md.lv4}\s*(.marginpar)/m,'\1') +      @txt.gsub!(/#{@md.lv4}\s*(.marginpar)/m,'\1')      end      def level5 -      # there is a problem here with creation of headers does not do what you would want it to header starts with a * and is not in bold work on \\@string*, same for next section 2002w46 -      @string.strip! if @string -      @string.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') -      cont_ln=@string.dup +      # there is a problem here with creation of headers does not do what you would want it to header starts with a * and is not in bold work on \\@txt*, same for next section 2002w46 +      @txt.strip! if @txt +      @txt.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') +      cont_ln=@txt.dup        cont_ln.gsub!(@@tex_pattern_margin_number,'')        cont_ln.gsub!(/#{Mx[:lv_o]}5:\S*?#{Mx[:lv_c]}\s*/,'')        cont_ln.gsub!(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22        cont_ln.gsub!(/\\Footnote[A]\{[*+]+\d*\}\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22        cont_ln.gsub!(/\\\&/,' and ') #revisit: tmp bugfix 200507, substitutes & with 'and' in toc, needed e.g. for AT&T, see ffa -      @string.gsub!(/#{@md.lv5}\s+(#{@md.lv5})/m,'\1') -      if @string =~/\\footnote/ #and para =~/^[1-6]#{@@tilde}/ # removing footnotes from headings! +      @txt.gsub!(/#{@md.lv5}\s+(#{@md.lv5})/m,'\1') +      if @txt =~/\\footnote/ #and para =~/^[1-6]#{@@tilde}/ # removing footnotes from headings!          cont_ln.gsub!(/\s*\\footnote\[\d+\]\{%\n .+? \}\s*/,' ')          cont_ln.gsub!(/\s*\\Footnote[A]\{[*+]+\d*\}\{%\n .+? \}\s*/,' ')        end -      if @string !~/#{Mx[:lv_o]}5:/ -        @string.gsub!(/(#{@md.lv5}.*?)\n?$/m,"\\subsubsection*{\\1} +      if @txt !~/#{Mx[:lv_o]}5:/ +        @txt.gsub!(/(#{@md.lv5}.*?)\n?$/m,"\\subsubsection*{\\1}  \\addcontentsline{toc}{subsubsection}{#{cont_ln} \\\\  }")        else -        @string.gsub!(/^\s*#{Mx[:lv_o]}5:\S*?#{Mx[:lv_c]}\s*(.*)?\n?$/m, +        @txt.gsub!(/^\s*#{Mx[:lv_o]}5:\S*?#{Mx[:lv_c]}\s*(.*)?\n?$/m,            "\\subsubsection*{\\1}  \\addcontentsline{toc}{subsubsection}{#{cont_ln} \\\\  }")        end -      @string.gsub!(/#{@md.lv5}\s*(.marginpar)/m,'\1') +      @txt.gsub!(/#{@md.lv5}\s*(.marginpar)/m,'\1')      end      def level6 -      # there is a problem here with creation of headers does not do what you would want it to header starts with a * and is not in bold work on \\sub@string*, same for previous section 2002w46 -      @string.strip! if @string -      @string.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') -      cont_ln=@string.dup +      # there is a problem here with creation of headers does not do what you would want it to header starts with a * and is not in bold work on \\sub@txt*, same for previous section 2002w46 +      @txt.strip! if @txt +      @txt.gsub!(/(?:\\begin\{bfseries\}|\\begin\{itshape\})(.+?)(?:\\end\{bfseries\}|\\end\{itshape\})/m,'\1') +      cont_ln=@txt.dup        cont_ln.gsub!(@@tex_pattern_margin_number,'')        cont_ln.gsub!(/#{Mx[:lv_o]}6:\S*?#{Mx[:lv_c]}\s*/,'')        cont_ln.gsub!(/\\footnote\[\d+\]\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22        cont_ln.gsub!(/\\Footnote[A]\{[*+]+\d*\}\{%.+?\\end\{scriptsize\}\s*\}/m,'') #arbitrary bugfix, revisit should not be necessary, eg. wta.1994 2004w22 -      @string.gsub!(/#{@md.lv6}\s+(#{@md.lv6})/m,'\1') -      if @string =~/\\footnote/ #and para =~/^[1-6]#{@@tilde}/ # removing footnotes from headings! +      @txt.gsub!(/#{@md.lv6}\s+(#{@md.lv6})/m,'\1') +      if @txt =~/\\footnote/ #and para =~/^[1-6]#{@@tilde}/ # removing footnotes from headings!          cont_ln.gsub!(/\s*\\footnote\[\d+\]\{%\n .+? \}\s*/,' ')          cont_ln.gsub!(/\s*\\Footnote[A]\{[*+]+\d*\}\{%\n .+? \}\s*/,' ')        end -      @string.gsub!(/(#{@md.lv6}.*)\n?$/m, -        "\\subsubsection*{\\1}") if (@string !~/#{Mx[:lv_o]}6:/) -      @string.gsub!(/^\s*#{Mx[:lv_o]}6:\S*?#{Mx[:lv_c]}\s*(.*)?\n?$/m, +      @txt.gsub!(/(#{@md.lv6}.*)\n?$/m, +        "\\subsubsection*{\\1}") if (@txt !~/#{Mx[:lv_o]}6:/) +      @txt.gsub!(/^\s*#{Mx[:lv_o]}6:\S*?#{Mx[:lv_c]}\s*(.*)?\n?$/m,          '\subsubsection*{\1}') -      @string.gsub!(/#{@md.lv6}\s*(.marginpar)/m,'\1') +      @txt.gsub!(/#{@md.lv6}\s*(.marginpar)/m,'\1')        #end BUGWATCH      end      def indent(lev) @@ -362,25 +377,25 @@ para        when /8/; '70mm'        when /9/; '80mm'        end -      @string.gsub!(/#{Mx[:pa_o]}:i#{lev}#{Mx[:pa_c]}\s*(.*)/m, +      @txt.gsub!(/#{Mx[:pa_o]}:i#{lev}#{Mx[:pa_c]}\s*(.*)/m,          "\\begin{ParagraphIndent}{#{indent}}\\1  \\end{ParagraphIndent}}")      end      def symbol_graphic        dir=SiSU_Env::Info_env.new(@md.fns) -      image='c_' + /<:=\s*(\S+?)\s*>/m.match(@string).captures.join + '.png' #watch +      image='c_' + /<:=\s*(\S+?)\s*>/m.match(@txt).captures.join + '.png' #watch        if FileTest.file?("#{dir.path.image_source_tex}/#{image}") -        @string.gsub!(/<:=\s*(\S+?)\s*>/, +        @txt.gsub!(/<:=\s*(\S+?)\s*>/,            "\\includegraphics*[width=11pt]{#{dir.path.image_source_tex}/c_\\1.png}")        else          tell=SiSU_Screen::Ansi.new(@md.cmd,"ERROR - image:",%{"#{image}" missing},"search path: #{dir.path.image_source_tex}")          tell.error2 unless @md.cmd =~/q/ -        @string.gsub!(/#{Mx[:lnk_o]}\S+\.(png|jpg|gif).+?#{Mx[:lnk_c]}(?:https?|file|ftp):\/\/\S+/,'') # fragile match operator\\ fragile ! +        @txt.gsub!(/#{Mx[:lnk_o]}\S+\.(png|jpg|gif).+?#{Mx[:lnk_c]}(?:https?|file|ftp):\/\/\S+/,'') # fragile match operator\\ fragile !        end      end      def image        dir=SiSU_Env::Info_env.new(@md.fns) -      image,m=/#{Mx[:lnk_o]}\s*(\S+)\s+.+?width=``(\d+)''.+?#{Mx[:lnk_c]}/m.match(@string).captures +      image,m=/#{Mx[:lnk_o]}\s*(\S+)\s+.+?width=``(\d+)''.+?#{Mx[:lnk_c]}/m.match(@txt).captures        width=m[1] || '100'        width=width.to_i*0.4        image_source=if @md.fns =~/\.(?:ssm\.)?sst$/ \ @@ -397,17 +412,17 @@ para          nil        end        if image_source -        @string.gsub!(/#{Mx[:lnk_o]}\s*((?:https?|file|ftp):\/\/\S+)\s+(\S+).+?#{Mx[:lnk_c]}/, +        @txt.gsub!(/#{Mx[:lnk_o]}\s*((?:https?|file|ftp):\/\/\S+)\s+(\S+).+?#{Mx[:lnk_c]}/,            @center_begin + "\\href{\\1}{\\includegraphics*[width=#{width}pt]{#{image_source}/\\2}}" + @center_end ) -        @string.gsub!(/#{Mx[:lnk_o]}\s*(\S+)\s+.+?#{Mx[:lnk_c]}/, +        @txt.gsub!(/#{Mx[:lnk_o]}\s*(\S+)\s+.+?#{Mx[:lnk_c]}/,            @center_begin + "\\includegraphics*[width=#{width}pt]{#{image_source}/\\1}" + @center_end ) -      else @string.gsub!(/#{Mx[:lnk_o]}\s*(\S+)\s+.+?#{Mx[:lnk_c]}/,'\1}') +      else @txt.gsub!(/#{Mx[:lnk_o]}\s*(\S+)\s+.+?#{Mx[:lnk_c]}/,'\1}')        end      end      def png #fc missing image check        dir=SiSU_Env::Info_env.new(@md.fns)        # messy clean up -      z=@string[/#{Mx[:lnk_o]}(\S.+?)#{Mx[:lnk_c]}(?:image|png)/,1].strip if @string =~ /#{Mx[:lnk_o]}\S.+?#{Mx[:lnk_c]}(?:image|png)/ # match operator for z \\ fragile ! +      z=@txt[/#{Mx[:lnk_o]}(\S.+?)#{Mx[:lnk_c]}(?:image|png)/,1].strip if @txt =~ /#{Mx[:lnk_o]}\S.+?#{Mx[:lnk_c]}(?:image|png)/ # match operator for z \\ fragile !        if z #debug 2004w14          image=z[/(\S+?\.(?:png|jpg|gif)\b)/m]          image.gsub!(/\\/,'') @@ -438,18 +453,18 @@ para          nil        end        if image_source -        @string.gsub!(/#{Mx[:lnk_o]}\S+\.(png|jpg|gif).+?#{Mx[:lnk_c]}(image|png)/, # fragile match operator\\ fragile ! +        @txt.gsub!(/#{Mx[:lnk_o]}\S+\.(png|jpg|gif).+?#{Mx[:lnk_c]}(image|png)/, # fragile match operator\\ fragile !            "#@center_begin\n\\includegraphics*[width=#{width}pt]{#{image_source}/#{image}}#{caption}#@center_end") -      else @string.gsub!(/#{Mx[:lnk_o]}\S+\.(png|jpg|gif).+?#{Mx[:lnk_c]}(image|png)/,'') +      else @txt.gsub!(/#{Mx[:lnk_o]}\S+\.(png|jpg|gif).+?#{Mx[:lnk_c]}(image|png)/,'')        end      end      def http_word_mode #(orientation='')        # clean up ! - work area, testing        dir=SiSU_Env::Info_env.new(@md.fns) -      @words=[] +      @w=[]        @url_generic_rgx=/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:https?|file|ftp):\/\/\S+/ -      @string.each do |word| -        @words << if word=~@url_generic_rgx +      @words.each do |word| +        @w << if word=~@url_generic_rgx            if word =~/#{Mx[:lnk_o]}(?:.+?)#{Mx[:lnk_c]}(?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?(?:[;.,]?(?:\s|$)|(?:\s|$))/              regx_url=%r/#{Mx[:lnk_o]}(.+?)#{Mx[:lnk_c]}((?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?)(?:[;.,]?(?:\s|$)|(?:\s|$))/              punctuate=/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:https?|file|ftp):\/\/\S+?\.[^'"><\s]+?([;.,]?(?:\s|$))/.match(word).captures.join @@ -521,20 +536,21 @@ para          else word          end        end -      @words=@words.join -      @words +      @txt=@w.join +      @txt      end      def http -      wm=@string.dup.scan(/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:(?:https?|file|ftp):\S+|image)|\w+\s*|./m) -      @string=SiSU_TeX_Pdf::Format_text_object.new(@md,wm,@ps).http_word_mode #GET PAPER SIZE AND USE IT +      wm=@txt.dup.scan(/#{Mx[:lnk_o]}.+?#{Mx[:lnk_c]}(?:(?:https?|file|ftp):\S+|image)|\w+\s*|./m) +      txt_obj={:words =>wm,:paper_size =>@ps} +      @txt=SiSU_TeX_Pdf::Format_text_object.new(@md,txt_obj).http_word_mode #GET PAPER SIZE AND USE IT      end      def title -      @string=SiSU_TeX_Pdf::Special_characters.new(@md,@string).special_characters_safe -      if @string1 -        @string1=SiSU_TeX_Pdf::Special_characters.new(@md,@string1).special_characters_safe -        @string1.gsub!(/\$/,"\\$") -        "\n\\title{#@string#{@@tex_backslash*2} \\textbf{\\normalsize #@string1}\\normalsize}" -      else "\n\\title{#@string}" +      @txt=SiSU_TeX_Pdf::Special_characters.new(@md,@title).special_characters_safe +      if @subtitle +        @subtitle=SiSU_TeX_Pdf::Special_characters.new(@md,@subtitle).special_characters_safe +        @subtitle.gsub!(/\$/,"\\$") +        "\n\\title{#@title#{@@tex_backslash*2} \\textbf{\\normalsize #@subtitle}\\normalsize}" +      else "\n\\title{#@txt}"        end      end      def title_landscape @@ -547,33 +563,49 @@ para        paranumber_display=if @md.markup.inspect =~/no_ocn/ \        or @md.mod.inspect =~/--no-ocn/          '' -      else "\\begin{tiny}~\\end{tiny}{\\marginpar{\\begin{tiny}#@string1\\end{tiny}}}" #ocn object citation numbering +      else "\\begin{tiny}~\\end{tiny}{\\marginpar{\\begin{tiny}#@ocn\\end{tiny}}}" #ocn object citation numbering        end -      if @string !~/^(?:#{Mx[:lv_o]}[1-6a-z-]:|#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}|<:.+?>|#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6})/ -        @string.gsub!(/^\s*(.+)/m,"#{paranumber_display}\\1\n") #watch - in 1-6 is suspect +      if @txt !~/^(?:#{Mx[:lv_o]}[1-6a-z-]:|#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]}|<:.+?>|#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6})/ +        @txt.gsub!(/^\s*(.+)/m,"#{paranumber_display}\\1\n") #watch - in 1-6 is suspect        else -        if (@string =~/^(?:#{Mx[:lv_o]}[1-6a-z-]:|#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]})/) #watch - in 1-6 is suspect -          @string.gsub!(/^(#{Mx[:lv_o]}[1-6a-z-]:\S*?#{Mx[:lv_c]})\s*(.+)/m,"\\1 #{paranumber_display}\\2\n") #watch - in 1-6 is suspect -          #@string.gsub!(/^(#{Mx[:lv_o]}[1-6a-z-]:\S*?#{Mx[:lv_c]})\s*(.+)/m,"\\1 #{paranumber_display} \\begin{bfseries}\\2 \\end{bfseries}\n") #watch - in 1-6 is suspect -          #@string.gsub!(/^(#{Mx[:lv_o]}[1-6a-z-]:\S*?#{Mx[:lv_c]})\s*(.+)/m,"\\1 #{paranumber_display} \\emph{\\2}\n") #watch - in 1-6 is suspect -          @string.gsub!(/^(#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]})\s*(.+)/m,"\\1 #{paranumber_display}\\2\n") #WHAT? -          #@string.gsub!(/^(<:.+?>)\s*(.+)/m,"\\1 #{paranumber_display}\\2\n") #WHAT? +        if (@txt =~/^(?:#{Mx[:lv_o]}[1-6a-z-]:|#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]})/) #watch - in 1-6 is suspect +          @txt.gsub!(/^(#{Mx[:lv_o]}[1-6a-z-]:\S*?#{Mx[:lv_c]})\s*(.+)/m,"\\1 #{paranumber_display}\\2\n") #watch - in 1-6 is suspect +          #@txt.gsub!(/^(#{Mx[:lv_o]}[1-6a-z-]:\S*?#{Mx[:lv_c]})\s*(.+)/m,"\\1 #{paranumber_display} \\begin{bfseries}\\2 \\end{bfseries}\n") #watch - in 1-6 is suspect +          #@txt.gsub!(/^(#{Mx[:lv_o]}[1-6a-z-]:\S*?#{Mx[:lv_c]})\s*(.+)/m,"\\1 #{paranumber_display} \\emph{\\2}\n") #watch - in 1-6 is suspect +          @txt.gsub!(/^(#{Mx[:pa_o]}:i[1-9]#{Mx[:pa_c]})\s*(.+)/m,"\\1 #{paranumber_display}\\2\n") #WHAT? +          #@txt.gsub!(/^(<:.+?>)\s*(.+)/m,"\\1 #{paranumber_display}\\2\n") #WHAT?          else -          @string.gsub!(/((#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6}).+)$/,"\\2 #{paranumber_display} \\1\n") -          #@string.gsub!(/((#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6}).+)$/,"\\2 #{paranumber_display} \\begin{bfseries}\\1 \\end{bfseries}\n") -          #@string.gsub!(/((#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6}).+)$/,"\\2 #{paranumber_display}\\emph{\\1}\n") +          @txt.gsub!(/((#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6}).+)$/,"\\2 #{paranumber_display} \\1\n") +          #@txt.gsub!(/((#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6}).+)$/,"\\2 #{paranumber_display} \\begin{bfseries}\\1 \\end{bfseries}\n") +          #@txt.gsub!(/((#{@md.lv1}|#{@md.lv2}|#{@md.lv3}|#{@md.lv4}|#{@md.lv5}|#{@md.lv6}).+)$/,"\\2 #{paranumber_display}\\emph{\\1}\n")          end        end -      @string +      @txt      end    end    class Format_head -    def initialize(md,ps,layout=nil,string1=nil) -      @md,@ps,@layout,@string1=md,ps,layout,string1 +    def initialize(md,t_o) +      @md,@t_o=md,t_o +      if t_o.class == Hash +        @txt =t_o[:txt]            || nil +        #@title =t_o[:title]        || nil +        @subtitle =t_o[:subtitle]  || nil +        @ps =t_o[:paper_size]      || nil +        @ocn =t_o[:ocn]            || nil +        @layout=t_o[:orientation]  || nil +      #elsif t_o.class == Array +      #  @txt =txt[0] +      #elsif t_o.class == String +      #  @txt =txt +      else +        p t_o.class +        p caller +      end +        @tx=SiSU_Env::Get_init.instance.tex        @url_brace=SiSU_Viz::Skin.new.url_decoration        @tex2pdf=@@tex3pdf ||=SiSU_Env::System_call.new.tex2pdf_engine -      @ps=@string if @string=~/(?:a4|letter|legal|book|a5|b5)/i +      @ps=@txt if @txt=~/(?:a4|letter|legal|book|a5|b5)/i      end      def language        @lang=if @md.dc_language[:code] @@ -786,7 +818,7 @@ WOK  \\usepackage{thumbpdf}  \\usepackage[#{@tex2pdf},    #{color.strip} -  pdftitle={#@string1}, +  pdftitle={#{@txt}},  %  pdftitle={Untitled},    pdfauthor={LM-sisu-scribe},    pdfsubject={law}, @@ -820,7 +852,7 @@ WOK  \\definecolor{myblue}{rgb}{0,0,0.5}  \\definecolor{mywhite}{rgb}{1,1,1}  WOK -      elsif @string =~/dvi/ +      elsif @txt =~/dvi/        <<WOK  \\usepackage{url}  \\usepackage{alltt} @@ -858,7 +890,7 @@ WOK  WOK      end      def document_head_with_orientation -      endnotes=("\\usepackage{endnotes}" if @string =~/endnotes?/)||'' #not implemented see also def endnotes +      endnotes=("\\usepackage{endnotes}" if @txt =~/endnotes?/)||'' #not implemented see also def endnotes        language        <<WOK  #{tex_head_paper} @@ -921,7 +953,7 @@ WOK      @@flag_code=false      @@tex_backslash="\\\\"      def initialize(md,string) -      @md,@string=md,string +      @md,@txt=md,string        @dp=@@dp ||=SiSU_Env::Info_env.new.digest.pattern        #@tx=SiSU_Env::Get_init.instance.tex        @url_brace=SiSU_Viz::Skin.new.url_decoration @@ -929,7 +961,7 @@ WOK      end      def pdftex_special_characters_1(string)             # ~ ^ $ & % _ { }  #LaTeX special characters - KEEP list        #p @@utf_8.list -      #@string=Iconv.conv('ISO-8859-1', 'UTF-8', @string) +      #@txt=Iconv.conv('ISO-8859-1', 'UTF-8', @txt)        word=string.scan(/#{Mx[:mk_o]}\S+?#{Mx[:mk_c]}|\S+|\n/) #unless line =~/^(?:0~\S|%+\s)/        para_array=[]        string=if word @@ -971,7 +1003,7 @@ WOK        string.gsub!(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-')                                                # - SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#043#{Mx[:gl_c]}/,'+')                                                # + SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#044#{Mx[:gl_c]}/,',')                                                # + SiSU special character also LaTeX -      string.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'<=amp>') #unless @string=~/<:code>/                   # / SiSU special character also LaTeX +      string.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'<=amp>') #unless @txt=~/<:code>/                   # / SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'<=slash>')                                         # / SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'<=backslash>')                                     # \ SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'<=underscore>')                                    # _ SiSU special character also LaTeX @@ -1095,7 +1127,7 @@ WOK      end      def xetex_special_characters_1(string)             # ~ ^ $ & % _ { }  #LaTeX special characters - KEEP list        #p @@utf_8.list -      #string=Iconv.conv('ISO-8859-1', 'UTF-8', @string) +      #string=Iconv.conv('ISO-8859-1', 'UTF-8', @txt)        word=string.scan(/\S+|\n/) #unless line =~/^(?:0~\S|%+\s)/        para_array=[]        string=if word @@ -1138,7 +1170,7 @@ WOK        string.gsub!(/#{Mx[:gl_o]}#045#{Mx[:gl_c]}/,'-')                                                # - SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#043#{Mx[:gl_c]}/,'+')                                                # + SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#044#{Mx[:gl_c]}/,',')                                                # + SiSU special character also LaTeX -      string.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'<=amp>') #unless @string=~/<:code>/                   # / SiSU special character also LaTeX +      string.gsub!(/#{Mx[:gl_o]}#038#{Mx[:gl_c]}/,'<=amp>') #unless @txt=~/<:code>/                   # / SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#047#{Mx[:gl_c]}/,'<=slash>')                                         # / SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#092#{Mx[:gl_c]}/,'<=backslash>')                                     # \ SiSU special character also LaTeX        string.gsub!(/#{Mx[:gl_o]}#095#{Mx[:gl_c]}/,'<=underscore>')                                    # _ SiSU special character also LaTeX @@ -1275,33 +1307,33 @@ WOK        string      end      def special_characters                                                       #special characters - some substitutions are sequence sensitive, rearrange with care. -      string=@string +      string=@txt        case @tex2pdf        when /pdf/          string=pdftex_special_characters_1(string) unless string.nil? -        string=special_characters_unsafe_1(string) unless string.nil? #pdftex_special_characters_unsafe_1(@string) +        string=special_characters_unsafe_1(string) unless string.nil? #pdftex_special_characters_unsafe_1(@txt)          string=pdftex_special_characters_2(string) unless string.nil?          string=pdftex_special_characters_3(string) unless string.nil?        when /xe/          string=xetex_special_characters_1(string) unless string.nil? -        string=special_characters_unsafe_1(string) unless string.nil? #xetex_special_characters_unsafe_1(@string) +        string=special_characters_unsafe_1(string) unless string.nil? #xetex_special_characters_unsafe_1(@txt)          string=xetex_special_characters_2(string) unless string.nil? #issues with xetex          string=xetex_special_characters_3(string) unless string.nil?        end -      @string=string +      @txt=string      end      def special_characters_safe                                                  #special characters - some substitutions are sequence sensitive, rearrange with care. -      string=@string +      string=@txt        case @tex2pdf        when /pdf/ -        string=pdftex_special_characters_1(@string) unless string.nil? -        string=pdftex_special_characters_2(@string) unless string.nil? -        #special_characters_3(@string) +        string=pdftex_special_characters_1(@txt) unless string.nil? +        string=pdftex_special_characters_2(@txt) unless string.nil? +        #special_characters_3(@txt)        when /xe/ -        string=xetex_special_characters_1(@string) unless string.nil? -        string=xetex_special_characters_2(@string) unless string.nil? # remove this to start with, causes issues +        string=xetex_special_characters_1(@txt) unless string.nil? +        string=xetex_special_characters_2(@txt) unless string.nil? # remove this to start with, causes issues        end -      @string=string +      @txt=string      end    end    class Use_TeX | 
