diff options
Diffstat (limited to 'lib/sisu/v0/texpdf.rb')
| -rw-r--r-- | lib/sisu/v0/texpdf.rb | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/lib/sisu/v0/texpdf.rb b/lib/sisu/v0/texpdf.rb index 5b8e020f..a17033c8 100644 --- a/lib/sisu/v0/texpdf.rb +++ b/lib/sisu/v0/texpdf.rb @@ -61,9 +61,9 @@ module SiSU_TeX require 'pstore' require "#{SiSU_lib}/defaults" - require "#{SiSU_lib}/param" - include SiSU_Param include SiSU_Viz + require "#{SiSU_lib}/particulars" + include SiSU_Particulars require "#{SiSU_lib}/texpdf_format" include SiSU_TeX_Pdf @tex_file=@@tex_footnote_array=@@tex_col_w=[] @@ -79,17 +79,16 @@ module SiSU_TeX class Source #Songsheet #<SiSU_Param::MyFiles require 'pstore' require "#{SiSU_lib}/sysenv" - require "#{SiSU_lib}/param" include SiSU_Env - include SiSU_Param include SiSU_Viz require "#{SiSU_lib}/dal" include SiSU_DAL include SiSU_TeX def initialize(opt) @opt=opt - @md=SiSU_Param::Parameters.new(@opt).get - @env=SiSU_Env::Info_env.new(@opt.fns) + @particulars=SiSU_Particulars::Combined_singleton.instance.get_all(opt) + @md=@particulars.md + @env=@particulars.env end def directories begin @@ -108,7 +107,7 @@ module SiSU_TeX end def songsheet begin - @md=SiSU_Param::Parameters.new(@opt).get + @md=@particulars.md tell=SiSU_Screen::Ansi.new(@opt.cmd,'LaTeX/PDF') tell.green_title_hi unless @opt.cmd =~/q/ path=@env.url.output_tell @@ -116,7 +115,7 @@ module SiSU_TeX tell.flow if @opt.cmd =~/[MVv]/ tell=SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@env.program.pdf_viewer} #{path}/#{@md.fnb}/#{@md.fn[:pdf_p]}") tell.flow if @opt.cmd =~/[MVv]/ - @md=SiSU_Param::Parameters.new(@opt).get + @md=@particulars.md my_make=SiSU_Env::Create_file.new(@opt.cmd,@opt.fns) $flag=@md.cmd #introduced to pass 0 for no object citation numbers... to texpdf_format @dir_o="#{@env.path.output}/#{@opt.fnb}" @@ -125,12 +124,11 @@ module SiSU_TeX newfilename=filename_index #% needed needs to be reprogrammed !!! SiSU_Env::Info_skin.new(@md).select - dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here - SiSU_TeX::Source::LaTeX_create.new(dal_array,@md).songsheet - #SiSU_TeX::Source::LaTeX_create.new(dal_array,@md,'portrait').songsheet + dal_array=SiSU_DAL::Source.new(@opt).get # dal file drawn here + SiSU_TeX::Source::LaTeX_create.new(@particulars).songsheet dal_array='' pwd=Dir.pwd - SiSU_TeX::Source::LaTeX_to_pdf.new(@md).latexrun_selective + SiSU_TeX::Source::LaTeX_to_pdf.new(@md,@particulars.env).latexrun_selective Dir.chdir(pwd) rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error ensure @@ -159,9 +157,8 @@ module SiSU_TeX require 'fileutils' include FileUtils #::Verbose @@n_lpdf||=0 #change - def initialize(md) - @md=md - @env=SiSU_Env::Info_env.new(@md.fns) + def initialize(md,env) + @md,@env=md,env end def latex_do(texfilename) @texfilename=texfilename @@ -232,15 +229,17 @@ module SiSU_TeX end end class LaTeX_create - include SiSU_Param + #include SiSU_Param @@tex_backslash ||="\\\\" @@tilde='\\\\\\~' #?? debug crazy @@tex_head={ :p => nil, :l => nil } @@flag_alt,@@flag_group,@@flag_code=false,false,false @@dp,@@prefix_b=nil,nil - def initialize(data,md) - @data,@md=data,md - @env=SiSU_Env::Info_env.new(@md.fns) + def initialize(particulars) + @particulars=particulars + @md=@particulars.md + @env=@particulars.env + @data=@particulars.dal_array # dal file drawn here @st={ :tex=>{} } @tex=SiSU_TeX_Pdf::Use_TeX.new(@md) @vz=SiSU_Env::Get_init.instance.skin |