From e3286ac4c26946046a62026f360eedb819bd7a48 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 4 Jul 2009 08:47:53 -0400 Subject: texpdf mostly minor cleaning --- lib/sisu/v0/texpdf.rb | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb index facd3008..1e5375af 100644 --- a/lib/sisu/v0/texpdf.rb +++ b/lib/sisu/v0/texpdf.rb @@ -58,12 +58,12 @@ =end module SiSU_TeX require 'pstore' - require "#{SiSU_lib}/defaults" - include SiSU_Viz - require "#{SiSU_lib}/particulars" - include SiSU_Particulars - require "#{SiSU_lib}/texpdf_format" - include SiSU_TeX_Pdf + require "#{SiSU_lib}/defaults" # defaults.rb + include SiSU_Viz + require "#{SiSU_lib}/particulars" # particulars.rb + include SiSU_Particulars + require "#{SiSU_lib}/texpdf_format" # texpdf_format.rb + include SiSU_TeX_Pdf @tex_file=@@tex_footnote_array=@@tex_col_w=[] @@tex_backslash ||="\\\\" @@tilde='\\\\\\~' #?? debug crazy @@ -71,16 +71,15 @@ module SiSU_TeX @@column_instruct=@@squigle_close=@@tex_line_mode=@@tex_word_mode=@@line_mode='' @@tex_debug_counter=@@table_pagebreak_counter=@@tex_footnote_call_counter=@@tex_table_flag=@@tex_counter=@@tex_column=@@tex_columns=@@tex_columns=@@counting=0 @@tex_pattern_margin_number=/\\\\begin\\\{tiny\\\}\\\\hspace\\\{0mm\\\}\\\\end\\\{tiny\\\}\\\{\\\\marginpar.+?\s+/ - #@@tex_pattern_margin_number="\\\\marginpar.+?\s+" @@n=@@tableheader=@@rights=nil @@date ||=SiSU_Env::Info_date.new class Source #Songsheet #||)/,' ') } group_collect=[] group_collect << '\begin{footnotesize} ' unless @@flag_code @group_collect.each do |x| @@ -461,7 +460,6 @@ module SiSU_TeX group_collect << ' \end{footnotesize} ' unless @@flag_code @group_collect=group_collect.flatten @lineone.gsub!(/(<:\S+>|#{Mx[:fa_o]}.*?#{Mx[:fa_c]}|#{Mx[:gr_o]}.*?#{Mx[:gr_c]}||)/,' ') - #@group_collect.each{ |x| x.gsub!(/(.#{@@tilde}\S*\s*|<:\S+>||)/,' ') } insert=[] insert=if para =~/#{Mx[:gr_o]}code-end#{Mx[:gr_c]}/m insert << y + @lineone << @group_collect << ' \end{scriptsize}' << " #{@tex.paraskip_normal}" @@ -470,14 +468,10 @@ module SiSU_TeX para.gsub!(/(<:\S+>|#{Mx[:fa_o]}.*?#{Mx[:fa_c]}|#{Mx[:gr_o]}.*?#{Mx[:gr_c]}||)/,' ') @@flag_alt,@@flag_group,@@flag_code=false,false,false @group_collect=[] - #@tex_file << insert.flatten tex_f=insert.flatten end para=tex_f else - #if para =~ /\}(?:https?|file|ftp)/ - # para=mono.http #(@orientation) - #end case para when /^#{Mx[:lv_o_1]}/; mono.level1 when /^#{Mx[:lv_o_2]}/; mono.level2 @@ -551,9 +545,6 @@ WOK sisu_rc_footnote=if @md.sc_info; @tex.doc_sc_info_footnote_full else @tex.doc_sc_info_footnote_brief end - #@copymark=if @md.author_copymark; '^\copyright' - #else '' - #end @copymark='' #check and remove as now is superflous x={} txt_obj={:title =>@md.title,:subtitle =>@md.subtitle} -- cgit v1.2.3