v5 v6: base images & css, continue

1 files changed, 17 insertions, 17 deletions

diff --git a/lib/sisu/v6/sysenv.rb b/lib/sisu/v6/sysenv.rb
index 902cedfb..f1b69edc 100644
--- a/lib/sisu/v6/sysenv.rb
+++ b/lib/sisu/v6/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