v4 v5: fuchsia (sp.)

8 files changed, 29 insertions, 29 deletions

diff --git a/lib/sisu/v4/cgi_pgsql.rb b/lib/sisu/v4/cgi_pgsql.rb
index 3698f769..f012fb51 100644
--- a/lib/sisu/v4/cgi_pgsql.rb
+++ b/lib/sisu/v4/cgi_pgsql.rb
@@ -133,9 +133,9 @@ module  SiSU_CGI_PgSQL
               to modify use:           #{@cX.brown}sisu --db-pg --webserv-output='#{@name_of[:host_url_docs]}'#{@cX.off}
             cgi search form link name: #{@cX.green}#{@name_of[:cgi_script]}#{@cX.off}
               to modify use:           #{@cX.brown}sisu --db-pg --cgi-search-form-name='#{@name_of[:cgi_script]}'#{@cX.off}
-            #{@cX.fuschia}(settings priority: command line; sisurc.yml; else defaults)#{@cX.off}
+            #{@cX.fuchsia}(settings priority: command line; sisurc.yml; else defaults)#{@cX.off}
 
-            #{@cX.fuschia}BASED ON ALREADY EXISTING databases#{@cX.off} (default database name: #{@db.psql.db})
+            #{@cX.fuchsia}BASED ON ALREADY EXISTING databases#{@cX.off} (default database name: #{@db.psql.db})
             NOTE it is first necessary to createdb,
             use sisu to create the tables & populate the postgresql db
 
diff --git a/lib/sisu/v4/cgi_sqlite.rb b/lib/sisu/v4/cgi_sqlite.rb
index b3b67d42..da7aa97a 100644
--- a/lib/sisu/v4/cgi_sqlite.rb
+++ b/lib/sisu/v4/cgi_sqlite.rb
@@ -120,9 +120,9 @@ module  SiSU_CGI_SQLite
               to modify use:           #{@cX.brown}sisu --db-sqlite --webserv-output='#{@env.url.webserv_files_from_db(@opt)}'#{@cX.off}
             cgi search form link name: #{@cX.green}#{@env.url.cgi_sample_search_form_name(@opt)}#{@cX.off}
               to modify use:           #{@cX.brown}sisu --db-sqlite --cgi-search-form-name='#{@env.url.cgi_sample_search_form_name(@opt)}'#{@cX.off}
-            #{@cX.fuschia}(settings priority: command line; sisurc.yml; else defaults)#{@cX.off}
+            #{@cX.fuchsia}(settings priority: command line; sisurc.yml; else defaults)#{@cX.off}
 
-            #{@cX.fuschia}NOTE it is first necessary to create the database and tables and populate it#{@cX.off}
+            #{@cX.fuchsia}NOTE it is first necessary to create the database and tables and populate it#{@cX.off}
 
             sisu --sqlite --dropall                          # removes existing postgresql db & tables
             sisu --sqlite --createall -v                     # creates postgresql db & tables
diff --git a/lib/sisu/v4/composite.rb b/lib/sisu/v4/composite.rb
index c2ba1fe1..0d0655b8 100644
--- a/lib/sisu/v4/composite.rb
+++ b/lib/sisu/v4/composite.rb
@@ -191,7 +191,7 @@ module SiSU_Assemble
             file[:prepared]
           else
             cX=SiSU_Screen::Ansi.new(@opt.cmd).cX
-            STDERR.puts "\t  #{cX.fuschia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuschia}requires invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
+            STDERR.puts "\t  #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
             para
           end
         else tuned_file << para
@@ -242,7 +242,7 @@ module SiSU_Assemble
             @ssm << loadfile
           else
             cX=SiSU_Screen::Ansi.new(@opt.cmd).cX
-            STDERR.puts "\t  #{cX.fuschia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuschia}requires invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
+            STDERR.puts "\t  #{cX.fuchsia}ERROR#{cX.off} #{cX.brown}#{@opt.fns}#{cX.off} #{cX.fuchsia}requires invalid or non-existent file:#{cX.off} #{cX.brown}#{loadfile}#{cX.off}"
             para
           end
         end
diff --git a/lib/sisu/v4/hub.rb b/lib/sisu/v4/hub.rb
index 72ed5a6b..cd3cdf91 100644
--- a/lib/sisu/v4/hub.rb
+++ b/lib/sisu/v4/hub.rb
@@ -221,10 +221,10 @@ module SiSU
       SiSU_Webserv::WebrickStart.new
     end
     def not_found
-      puts "\n#{@cX.fuschia}FILE NOT FOUND:#{@cX.off} << #{@opt.fns} >> - requested #{@opt.cmd} processing skipped\n"
+      puts "\n#{@cX.fuchsia}FILE NOT FOUND:#{@cX.off} << #{@opt.fns} >> - requested #{@opt.cmd} processing skipped\n"
     end
     def convert_name_message(fns,type,i,o,rune)
-      %{\nIn filename: "#{@cX.fuschia}#{fns}#{@cX.off}" << #{type} >> #{@cX.fuschia}is apre 0.36 markup filename.#{@cX.off} #{@cX.brown}Please rename your file.#{@cX.off}\n\tAs of sisu-0.37, SiSU markup files with #{@cX.brown}the extensions #{i} should be re-named #{o}#{@cX.off}\n\tif you have the program called 'rename' installed, the following rune should do the trick:\n\t\t#{rune}\n\talternatively try:\n\t\tsisu --convert --36to37 #{fns}\n\trequested #{@opt.cmd} processing skipped\n}
+      %{\nIn filename: "#{@cX.fuchsia}#{fns}#{@cX.off}" << #{type} >> #{@cX.fuchsia}is apre 0.36 markup filename.#{@cX.off} #{@cX.brown}Please rename your file.#{@cX.off}\n\tAs of sisu-0.37, SiSU markup files with #{@cX.brown}the extensions #{i} should be re-named #{o}#{@cX.off}\n\tif you have the program called 'rename' installed, the following rune should do the trick:\n\t\t#{rune}\n\talternatively try:\n\t\tsisu --convert --36to37 #{fns}\n\trequested #{@opt.cmd} processing skipped\n}
     end
     def not_recognised
       case @opt.fns
@@ -238,9 +238,9 @@ module SiSU
         puts convert_name_message(@opt.fns,type,'.r1 .r2 and .r3','.sst',rune)
         puts %{\n\tNote also that you will need to change the names of the files called/required\n\twithin the document text to build the composite document\n\t\t.s1 .s2 .s3 should be .sst \n\t\t.si should be .ssi\n\trequested #{@opt.cmd} processing skipped\n}
       when /(\.ssi)$/
-        puts "\n#{@cX.fuschia}component filetype:#{@cX.off} << #{@opt.fns} >> - is not a processed filetype, (it may be used as a component of a .ssm markup file)\n\trequested #{@opt.cmd} processing skipped\n"
+        puts "\n#{@cX.fuchsia}component filetype:#{@cX.off} << #{@opt.fns} >> - is not a processed filetype, (it may be used as a component of a .ssm markup file)\n\trequested #{@opt.cmd} processing skipped\n"
       else
-        puts "\n#{@cX.fuschia}FILETYPE NOT RECOGNISED:#{@cX.off} << #{@opt.fns} >> - is not a recognized filetype,\n\trequested #{@opt.cmd} processing skipped\n"
+        puts "\n#{@cX.fuchsia}FILETYPE NOT RECOGNISED:#{@cX.off} << #{@opt.fns} >> - is not a recognized filetype,\n\trequested #{@opt.cmd} processing skipped\n"
       end
     end
   end
diff --git a/lib/sisu/v4/rexml.rb b/lib/sisu/v4/rexml.rb
index 3e710be2..04d96d97 100644
--- a/lib/sisu/v4/rexml.rb
+++ b/lib/sisu/v4/rexml.rb
@@ -102,7 +102,7 @@ module SiSU_Rexml
             end
           end
         else
-          SiSU_Screen::Ansi.new(@md.opt.cmd,'fuschia',"File Not Found #{xmlfile}",'requested XML processing skipped').colorize unless @md.opt.cmd =~/q/
+          SiSU_Screen::Ansi.new(@md.opt.cmd,'fuchsia',"File Not Found #{xmlfile}",'requested XML processing skipped').colorize unless @md.opt.cmd =~/q/
           exit
         end
       rescue
diff --git a/lib/sisu/v4/screen_text_color.rb b/lib/sisu/v4/screen_text_color.rb
index 86b41e6b..ea9ae24d 100644
--- a/lib/sisu/v4/screen_text_color.rb
+++ b/lib/sisu/v4/screen_text_color.rb
@@ -61,7 +61,7 @@
 =end
 module SiSU_Screen
   class Color
-    attr_accessor :off,:marker,:bold,:underline,:invert,:darkgrey_hi,:grey_hi,:pink_hi,:fuschia_hi,:red_hi,:orange_hi,:yellow_hi,:brown_hi,:lightgreen_hi,:green_hi,:cyan_hi,:blue_hi,:navy_hi,:white,:white_bold,:grey,:pink,:fuschia,:ruby,:red,:orange,:yellow,:brown,:green,:darkgreen,:cyan,:blue,:navy,:black
+    attr_accessor :off,:marker,:bold,:underline,:invert,:darkgrey_hi,:grey_hi,:pink_hi,:fuchsia_hi,:red_hi,:orange_hi,:yellow_hi,:brown_hi,:lightgreen_hi,:green_hi,:cyan_hi,:blue_hi,:navy_hi,:white,:white_bold,:grey,:pink,:fuchsia,:ruby,:red,:orange,:yellow,:brown,:green,:darkgreen,:cyan,:blue,:navy,:black
     def initialize(&block)
       instance_eval &block
     end
@@ -83,7 +83,7 @@ module SiSU_Screen
       end
       @cX=@@cX= unless @use_color
         Color.new do
-          self.off=self.white=self.white_bold=self.marker=self.bold=self.underline=self.invert=self.darkgrey_hi=self.grey_hi=self.pink_hi=self.fuschia_hi=self.red_hi=self.orange_hi=self.yellow_hi=self.brown_hi=self.lightgreen_hi=self.green_hi=self.cyan_hi=self.blue_hi=self.navy_hi=self.grey=self.pink=self.fuschia=self.ruby=self.red=self.orange=self.yellow=self.brown=self.green=self.darkgreen=self.cyan=self.blue=self.navy=self.black=''
+          self.off=self.white=self.white_bold=self.marker=self.bold=self.underline=self.invert=self.darkgrey_hi=self.grey_hi=self.pink_hi=self.fuchsia_hi=self.red_hi=self.orange_hi=self.yellow_hi=self.brown_hi=self.lightgreen_hi=self.green_hi=self.cyan_hi=self.blue_hi=self.navy_hi=self.grey=self.pink=self.fuchsia=self.ruby=self.red=self.orange=self.yellow=self.brown=self.green=self.darkgreen=self.cyan=self.blue=self.navy=self.black=''
         end
       else                                                                       #default set to colors on
         Color.new do
@@ -97,7 +97,7 @@ module SiSU_Screen
           self.darkgrey_hi   = "\033[100m"
           self.grey_hi       = "\033[47m"
           self.pink_hi       = "\033[105m"
-          self.fuschia_hi    = "\033[45m"
+          self.fuchsia_hi    = "\033[45m"
           self.red_hi        = "\033[41m"
           self.orange_hi     = "\033[101m"
           self.yellow_hi     = "\033[103m"
@@ -109,7 +109,7 @@ module SiSU_Screen
           self.navy_hi       = "\033[44m"
           self.grey          = "\033[90m"
           self.pink          = "\033[95m"
-          self.fuschia       = "\033[35m"
+          self.fuchsia       = "\033[35m"
           self.ruby          = "\033[31m"
           self.red           = "\033[91m" #check
           self.orange        = "\033[91m"
@@ -134,7 +134,7 @@ module SiSU_Screen
       when /darkgrey_hi/;   @cX.darkgrey_hi
       when /grey_hi/;       @cX.grey_hi
       when /pink_hi/;       @cX.pink_hi
-      when /fuschia_hi/;    @cX.fuschia_hi
+      when /fuchsia_hi/;    @cX.fuchsia_hi
       when /red_hi/;        @cX.red_hi
       when /orange_hi/;     @cX.orange_hi
       when /yellow_hi/;     @cX.yellow_hi
@@ -147,7 +147,7 @@ module SiSU_Screen
       when /white/;         @cX.white
       when /grey/;          @cX.grey
       when /pink/;          @cX.pink
-      when /fuschia/;       @cX.fuschia
+      when /fuchsia/;       @cX.fuchsia
       when /ruby/;          @cX.ruby
       when /red/;           @cX.red
       when /orange/;        @cX.orange
@@ -168,7 +168,7 @@ module SiSU_Screen
       when /darkgrey_hi/;   puts "#{@cX.darkgrey_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
       when /grey_hi/;       puts "#{@cX.grey_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
       when /pink_hi/;       puts "#{@cX.pink_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
-      when /fuschia_hi/;    puts "#{@cX.fuschia_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
+      when /fuchsia_hi/;    puts "#{@cX.fuchsia_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
       when /red_hi/;        puts "#{@cX.red_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
       when /orange_hi/;     puts "#{@cX.orange_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
       when /yellow_hi/;     puts "#{@cX.yellow_hi}#{@txt[1]}#{@cX.off} #{@cX.blue}#{@txt[2]}#{@cX.off} #{@cX.grey}#{@txt[3]}#{@cX.off}"
@@ -182,7 +182,7 @@ module SiSU_Screen
       when /white/;          puts "#{@cX.off}#{@txt[1]} #{@txt[2]}"
       when /grey/;          puts "#{@cX.grey}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
       when /pink/;          puts "#{@cX.pink}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
-      when /fuschia/;       puts "#{@cX.fuschia}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
+      when /fuchsia/;       puts "#{@cX.fuchsia}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
       when /ruby/;          puts "#{@cX.ruby}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
       when /red/;           puts "#{@cX.red}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
       when /orange/;        puts "#{@cX.orange}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
@@ -204,16 +204,16 @@ module SiSU_Screen
     def sisu
     end
     def rescue
-      STDERR.puts %{\t   #{@cX.orange}Rescued#{@cX.off} #{@cX.grey}#{yield if block_given?}\n\t   An#{@cX.off} #{@cX.fuschia}ERROR#{@cX.off} #{@cX.grey}occurred, message:#{@cX.off} #{@cX.fuschia}#{@txt[0]}#{@cX.off} #{@cX.grey}#{@txt[1]}#{@cX.off} #{@cX.brown}#{@txt[2]}#{@cX.off}}
+      STDERR.puts %{\t   #{@cX.orange}Rescued#{@cX.off} #{@cX.grey}#{yield if block_given?}\n\t   An#{@cX.off} #{@cX.fuchsia}ERROR#{@cX.off} #{@cX.grey}occurred, message:#{@cX.off} #{@cX.fuchsia}#{@txt[0]}#{@cX.off} #{@cX.grey}#{@txt[1]}#{@cX.off} #{@cX.brown}#{@txt[2]}#{@cX.off}}
     end
     def warn
       STDERR.puts "\t  #{@cX.brown}#{@txt[0]}#{@cX.off} #{@cX.grey}#{@txt[1]}#{@cX.off}"
     end
     def error
-      STDERR.puts "\t  #{@cX.fuschia}#{@txt[0]}#{@cX.off} #{@cX.brown}#{@txt[1]}#{@cX.off}"
+      STDERR.puts "\t  #{@cX.fuchsia}#{@txt[0]}#{@cX.off} #{@cX.brown}#{@txt[1]}#{@cX.off}"
     end
     def error2
-      STDERR.puts "\t  #{@cX.grey}#{@txt[0]}#{@cX.off} #{@cX.fuschia}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
+      STDERR.puts "\t  #{@cX.grey}#{@txt[0]}#{@cX.off} #{@cX.fuchsia}#{@txt[1]}#{@cX.off} #{@cX.grey}#{@txt[2]}#{@cX.off}"
     end
     def version
       puts "#{@cX.blue_hi}#{@txt[0]} #{@txt[1]}#{@cX.off} #{@cX.grey} (#{@txt[3]} [#{@txt[2]}]) &#{@cX.off} #{@cX.ruby}Ruby#{@cX.off} #{@cX.grey}(#{@txt[4]})#{@cX.off}\n"
@@ -421,7 +421,7 @@ __END__
           self.darkgrey_hi   = "\033[100m"
           self.grey_hi       = "\033[47m"
           self.pink_hi       = "\033[105m"
-          self.fuschia_hi    = "\033[45m"
+          self.fuchsia_hi    = "\033[45m"
           self.red_hi        = "\033[41m"
           self.orange_hi     = "\033[101m"
           self.yellow_hi     = "\033[103m"
@@ -433,7 +433,7 @@ __END__
           self.navy_hi       = "\033[44m"
           self.grey          = "\033[90m"
           self.pink          = "\033[95m"
-          self.fuschia       = "\033[35m"
+          self.fuchsia       = "\033[35m"
           self.ruby          = "\033[31m"
           self.red           = "\033[91m" #check
           self.orange        = "\033[91m"
@@ -457,7 +457,7 @@ __END__
           self.darkgrey_hi   = "\033[100m"
           self.grey_hi       = "\033[47m"
           self.pink_hi       = "\033[105m"
-          self.fuschia_hi    = "\033[45m"
+          self.fuchsia_hi    = "\033[45m"
           self.red_hi        = "\033[41m"
           self.orange_hi     = "\033[101m"
           self.yellow_hi     = "\033[103m"
@@ -469,7 +469,7 @@ __END__
           self.navy_hi       = "\033[44m"
           self.grey          = "\033[90m"
           self.pink          = "\033[95m"
-          self.fuschia       = "\033[35m"
+          self.fuchsia       = "\033[35m"
           self.ruby          = "\033[31m"
           self.red           = "\033[31m" #check
           self.orange        = "\033[91m"
diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb
index 32e38ac6..bcc2adce 100644
--- a/lib/sisu/v4/sysenv.rb
+++ b/lib/sisu/v4/sysenv.rb
@@ -1097,7 +1097,7 @@ module SiSU_Env
       elsif  output_dir_structure.by_filename?
         ''
       else
-        puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuschia)
+        puts SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).set(:fuchsia)
         puts 'set output type, by: language, filetype or filename'
       end
       @stub_set_manifest=stub + '/manifest'
diff --git a/lib/sisu/v4/texpdf.rb b/lib/sisu/v4/texpdf.rb
index c69067aa..d9aa2607 100644
--- a/lib/sisu/v4/texpdf.rb
+++ b/lib/sisu/v4/texpdf.rb
@@ -209,7 +209,7 @@ module SiSU_TeX
             FileUtils::cp(portrait_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_p}")
             FileUtils::rm(portrait_pdf)
           else
-            STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{portrait_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
+            STDERR.puts "#{cX.fuchsia}pdf file not generated#{cX.off} <#{cX.blue}#{portrait_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
             STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{portrait_pdf}" if @md.opt.cmd.inspect =~/M/
           end
         end
@@ -218,7 +218,7 @@ module SiSU_TeX
             FileUtils::cp(landscape_pdf,"#{@md.file.output_path.pdf.dir}/#{pdf_l}")
             FileUtils::rm(landscape_pdf)
           else
-            STDERR.puts "#{cX.fuschia}pdf file not generated#{cX.off} <#{cX.blue}#{landscape_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
+            STDERR.puts "#{cX.fuchsia}pdf file not generated#{cX.off} <#{cX.blue}#{landscape_pdf.gsub(/.+?([^\/]+?\.pdf)$/,'\1')}#{cX.off}> (check texlive dependencies)"
             STDERR.puts "#{__FILE__}:#{__LINE__} NOT FOUND: #{landscape_pdf}" if @md.opt.cmd.inspect =~/M/
           end
         end