From 3628703f6688b7c7c8436f97e7aeea1883dd4b28 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 15 Jul 2014 18:59:40 -0400 Subject: v5 v6: base images & css, continue --- lib/sisu/v5/conf.rb | 14 +++++++------- lib/sisu/v5/harvest.rb | 2 +- lib/sisu/v5/html.rb | 6 +++--- lib/sisu/v5/html_concordance.rb | 2 +- lib/sisu/v5/html_segments.rb | 4 ++-- lib/sisu/v5/manifest.rb | 2 +- lib/sisu/v5/sysenv.rb | 34 +++++++++++++++++----------------- lib/sisu/v5/xhtml.rb | 2 +- lib/sisu/v5/xml_docbook5.rb | 2 ++ lib/sisu/v5/xml_dom.rb | 2 +- lib/sisu/v5/xml_sax.rb | 2 +- 11 files changed, 37 insertions(+), 35 deletions(-) (limited to 'lib/sisu/v5') diff --git a/lib/sisu/v5/conf.rb b/lib/sisu/v5/conf.rb index b13b4bb1..04ac5cfa 100644 --- a/lib/sisu/v5/conf.rb +++ b/lib/sisu/v5/conf.rb @@ -107,7 +107,7 @@ module SiSU_Initialize 'Make homepage', '' ).colorize unless @opt.act[:quiet][:set]==:on - SiSU_Env::CreateSite.new(@opt.cmd).homepage + SiSU_Env::CreateSite.new(@opt).homepage end def cp_local_images SiSU_Screen::Ansi.new( @@ -116,9 +116,9 @@ module SiSU_Initialize 'Copy images', '' ).colorize unless @opt.act[:quiet][:set]==:on - SiSU_Env::CreateSite.new(@opt.cmd).cp_local_images - SiSU_Env::CreateSite.new(@opt.cmd).cp_webserver_images_local #this should not have been necessary - SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images #base images (nav etc.) used by all html + SiSU_Env::CreateSite.new(@opt).cp_local_images + SiSU_Env::CreateSite.new(@opt).cp_webserver_images_local #this should not have been necessary + SiSU_Env::CreateSite.new(@opt).cp_base_images #base images (nav etc.) used by all html end def cp_external_images SiSU_Screen::Ansi.new( @@ -127,7 +127,7 @@ module SiSU_Initialize 'Copy external images', '' ).colorize if @opt.act[:verbose_plus][:set]==:on - SiSU_Env::CreateSite.new(@opt.cmd).cp_external_images + SiSU_Env::CreateSite.new(@opt).cp_external_images end def cp_webserver_images SiSU_Screen::Ansi.new( @@ -136,7 +136,7 @@ module SiSU_Initialize 'Copy webserver/output file images', '' ).colorize unless @opt.act[:quiet][:set]==:on - SiSU_Env::CreateSite.new(@opt.cmd).cp_webserver_images + SiSU_Env::CreateSite.new(@opt).cp_webserver_images end def css SiSU_Screen::Ansi.new( @@ -145,7 +145,7 @@ module SiSU_Initialize 'Configuring CSSs', '' ).colorize unless @opt.act[:quiet][:set]==:on - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end def dtd SiSU_Screen::Ansi.new( diff --git a/lib/sisu/v5/harvest.rb b/lib/sisu/v5/harvest.rb index 6c9b144f..053df905 100644 --- a/lib/sisu/v5/harvest.rb +++ b/lib/sisu/v5/harvest.rb @@ -81,7 +81,7 @@ module SiSU_Harvest cases(@opt,@env) rescue ensure - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end end def help diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb index d1ee22e5..3258a0e5 100644 --- a/lib/sisu/v5/html.rb +++ b/lib/sisu/v5/html.rb @@ -89,8 +89,8 @@ module SiSU_HTML begin songsheet ensure - SiSU_Env::CreateSite.new(@opt.cmd).cp_css - SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images + SiSU_Env::CreateSite.new(@opt).cp_css + SiSU_Env::CreateSite.new(@opt).cp_base_images end end def songsheet @@ -177,7 +177,7 @@ module SiSU_HTML @links_guide_toc=[] def initialize(data,md) @data,@md=data,md - @links_guide_=SiSU_Env::CreateSite.new(@md.opt.cmd).html_quick_ref? + @links_guide_=SiSU_Env::CreateSite.new(@md.opt).html_quick_ref? end def toc @links_guide_toc=[] diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb index b9030123..cf10e001 100644 --- a/lib/sisu/v5/html_concordance.rb +++ b/lib/sisu/v5/html_concordance.rb @@ -108,7 +108,7 @@ module SiSU_Concordance __LINE__.to_s + ':' + __FILE__ end ensure - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end end private diff --git a/lib/sisu/v5/html_segments.rb b/lib/sisu/v5/html_segments.rb index 7a368b9d..12101b67 100644 --- a/lib/sisu/v5/html_segments.rb +++ b/lib/sisu/v5/html_segments.rb @@ -68,7 +68,7 @@ module SiSU_HTML_Seg class Output def initialize(md,outputfile,seg,minitoc,type='') @md,@output_seg_file,@seg,@minitoc,@type=md,outputfile,seg,minitoc,type - @title_banner_=SiSU_Env::CreateSite.new(@md.opt.cmd).html_seg_title_banner? + @title_banner_=SiSU_Env::CreateSite.new(@md.opt).html_seg_title_banner? @file=SiSU_Env::FileOp.new(@md) @make=SiSU_Env::ProcessingSettings.new(@md) @cl=(@make.build.html_minitoc?) \ @@ -166,7 +166,7 @@ module SiSU_HTML_Seg else @cl='content' end if @md - @title_banner_=SiSU_Env::CreateSite.new(@md.opt.cmd).html_seg_title_banner? + @title_banner_=SiSU_Env::CreateSite.new(@md.opt).html_seg_title_banner? end end def songsheet diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb index e1b6ce80..3216194d 100644 --- a/lib/sisu/v5/manifest.rb +++ b/lib/sisu/v5/manifest.rb @@ -106,7 +106,7 @@ module SiSU_Manifest __LINE__.to_s + ':' + __FILE__ end ensure - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end end private diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb index bca188d3..324f96e0 100644 --- a/lib/sisu/v5/sysenv.rb +++ b/lib/sisu/v5/sysenv.rb @@ -7037,8 +7037,8 @@ WOK class CreateSite < InfoEnv require_relative 'css' # css.rb include SiSU_Style - def initialize(cmd) - @cmd=cmd + def initialize(opt) + @opt=opt @env=SiSU_Env::InfoEnv.new @init=SiSU_Env::GetInit.new @home,@pwd=ENV['HOME'],ENV['PWD'] #@pwd=Dir.pwd @@ -7137,7 +7137,7 @@ WOK ] #BROKEN if defined? @rc['permission_set']['css_modify'] \ and @rc['permission_set']['css_modify'] - SiSU_Screen::Ansi.new(@cmd,"*WARN* modify is css set to: #{@rc['permission_set']['css_modify']}").warn if @cmd=~/[MV]/ + SiSU_Screen::Ansi.new(@opt.cmd,"*WARN* modify is css set to: #{@rc['permission_set']['css_modify']}").warn if @opt.cmd=~/[MV]/ css_path.each do |x| if FileTest.directory?(x) FileUtils::cd(x) @@ -7153,61 +7153,61 @@ WOK end else SiSU_Screen::Ansi.new( - @cmd, + @opt.cmd, "*WARN* modify css is not set or is set to: false" - ).warn if @cmd=~/[MV]/ + ).warn if @opt.cmd=~/[MV]/ end fn_css=SiSU_Env::CSS_Default.new css=SiSU_Style::CSS.new path_style="#{@env.path.output}/#{@env.path.style}" FileUtils::mkdir_p(path_style) unless FileTest.directory?(path_style) - if @cmd =~/C/ \ + if @opt.cmd =~/C/ \ or not FileTest.file?("#{path_style}/#{fn_css.homepage}") style=File.new("#{path_style}/#{fn_css.homepage}",'w') style << css.homepage style.close end - if @cmd =~/C/ \ + if @opt.cmd =~/C/ \ or not FileTest.file?("#{path_style}/#{fn_css.html_tables}") style=File.new("#{path_style}/#{fn_css.html_tables}",'w') style << css.html_tables style.close end - if @cmd =~/C/ \ + if @opt.cmd =~/C/ \ or not FileTest.file?("#{path_style}/#{fn_css.html}") style=File.new("#{path_style}/#{fn_css.html}",'w') style << css.html style.close end - if @cmd =~/C/ \ + if @opt.cmd =~/C/ \ or not FileTest.file?("#{path_style}/#{fn_css.harvest}") style=File.new("#{path_style}/#{fn_css.harvest}",'w') style << css.harvest style.close end - if @cmd =~/C/ \ - or (@cmd =~/[x]/ \ + if @opt.cmd =~/C/ \ + or (@opt.cmd =~/[x]/ \ and not FileTest.file?("#{path_style}/#{fn_css.xml_sax}")) style=File.new("#{path_style}/#{fn_css.xml_sax}",'w') style << css.xml_sax style.close end - if @cmd =~/C/ \ - or (@cmd =~/[X]/ \ + if @opt.cmd =~/C/ \ + or (@opt.cmd =~/[X]/ \ and not FileTest.file?("#{path_style}/#{fn_css.xml_dom}")) style=File.new("#{path_style}/#{fn_css.xml_dom}",'w') style << css.xml_dom style.close end - if @cmd =~/C/ \ - or (@cmd =~/[xX]/ \ + if @opt.cmd =~/C/ \ + or (@opt.act[:xml_docbook_book][:set] == :on \ and not FileTest.file?("#{path_style}/#{fn_css.xml_docbook}")) style=File.new("#{path_style}/#{fn_css.xml_docbook}",'w') style << css.xml_docbook style.close end - if @cmd =~/C/ \ - or (@cmd =~/[b]/ \ + if @opt.cmd =~/C/ \ + or (@opt.cmd =~/[b]/ \ and not FileTest.file?("#{path_style}/#{fn_css.xhtml}")) style=File.new("#{path_style}/#{fn_css.xhtml}",'w') style << css.xhtml diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb index 0e0d7781..ad6d3f0e 100644 --- a/lib/sisu/v5/xhtml.rb +++ b/lib/sisu/v5/xhtml.rb @@ -108,7 +108,7 @@ module SiSU_XHTML __LINE__.to_s + ':' + __FILE__ end ensure - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end end private diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb index 1ff3a96d..0fb6ee8d 100644 --- a/lib/sisu/v5/xml_docbook5.rb +++ b/lib/sisu/v5/xml_docbook5.rb @@ -87,6 +87,8 @@ module SiSU_XML_Docbook_Book __LINE__.to_s + ':' + __FILE__ end ensure + #SiSU_Env::CreateSite.new(@opt.cmd).cp_css + #SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images end end private diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb index c8f3d881..a1b316ac 100644 --- a/lib/sisu/v5/xml_dom.rb +++ b/lib/sisu/v5/xml_dom.rb @@ -109,7 +109,7 @@ module SiSU_XML_DOM __LINE__.to_s + ':' + __FILE__ end ensure - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end end private diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb index 1554056b..69a5962d 100644 --- a/lib/sisu/v5/xml_sax.rb +++ b/lib/sisu/v5/xml_sax.rb @@ -109,7 +109,7 @@ module SiSU_XML_SAX end ensure #file closed in songsheet - SiSU_Env::CreateSite.new(@opt.cmd).cp_css + SiSU_Env::CreateSite.new(@opt).cp_css end end private -- cgit v1.2.3