c&d: small fixes
authorRalph Amissah <ralph@amissah.com>
Thu, 25 Dec 2014 04:42:01 +0000 (23:42 -0500)
committerRalph Amissah <ralph@amissah.com>
Thu, 8 Jan 2015 03:42:40 +0000 (22:42 -0500)
lib/sisu/current/ao.rb
lib/sisu/current/se_info_env.rb
lib/sisu/develop/ao.rb
lib/sisu/develop/db_sqltxt.rb
lib/sisu/develop/se_info_env.rb
lib/sisu/develop/shared_markup_alt.rb
lib/sisu/develop/shared_metadata.rb

index 864d5836e6845a8ae56dc4e2cbb7e28e0c99d74f..633c4442042962e57f21ce211271756aaddbe7d9 100644 (file)
@@ -116,7 +116,7 @@ module SiSU_AO
         : @opt.fns
         create_ao
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@@fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@@fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -137,7 +137,7 @@ module SiSU_AO
         ? read_fnc
         : @@ao_array.dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -158,7 +158,7 @@ module SiSU_AO
         ? read_idx_sst
         : @@idx_arr[:sst].dup #check
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -179,7 +179,7 @@ module SiSU_AO
         ? read_idx_raw
         : @@idx_arr[:tex].dup #check
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -200,7 +200,7 @@ module SiSU_AO
         ? read_idx_html
         : @@idx_arr[:html].dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -221,7 +221,7 @@ module SiSU_AO
         ? read_idx_xhtml
         : @@idx_arr[:xhtml].dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -242,7 +242,7 @@ module SiSU_AO
         ? read_map_nametags
         : @@map_arr[:nametags].dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -263,7 +263,7 @@ module SiSU_AO
         ? read_map_ocn_htmlseg
         : @@map_arr[:ocn_htmlseg].dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
index 8917a1d2b3d31111a35d01bdaacb5ba76b917130..85dd043c64f708c51d455c6b49090b3b64866a88 100644 (file)
@@ -1081,7 +1081,7 @@ WOK
         @stub_pod
       end
       def etc
-        defaults[:sisu_etc]                                                      #live/dynamic
+        defaults[:sisu_etc]            #live/dynamic
       end
       def arch
         @sys.dir_arch
@@ -1125,7 +1125,7 @@ WOK
       def webserv_path #testing, check need, remove
         webserv
       end
-      def webserv               #separation required for webrick which cannot use path.output (different requirements as no file is passed)
+      def webserv                      #separation required for webrick which cannot use path.output (different requirements as no file is passed)
         man_path=if @@man_path.nil?
           man_path=if defined? @rc['webserv']['path'] \
           and @rc['webserv']['path'] =~/\S\S+/
@@ -1163,17 +1163,17 @@ WOK
       def webserv_map_pwd #dir
         "#{path.webserv}/#{base_markup_dir_stub}"
       end
-      def webserv_dir           #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+      def webserv_dir                  #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
         defaults[:webserv_dir]
       end
-      def webserv_image         #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+      def webserv_image                #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
         images=if defined? @rc['webserv']['images']
           @rc['webserv']['images']
         else defaults[:images]
         end
         "#{path.webserv}/#{images}"
       end
-      def output                #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
+      def output                       #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
         r=Px[:lng_lst_rgx]
         u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
         base_stub=@sys.pwd.gsub(u,'\1')
@@ -1191,7 +1191,7 @@ WOK
       def feed_home
         "#{public_output}/#{@rc['webserv']['feed_home']}"
       end
-      def scripts                                                                #used previously only to include tla version info
+      def scripts                      #used previously only to include tla version info
         if defined? @rc['project']['path']
           "#{home}/#{@rc['project']['path']}"
         end
index 747c987e4f6640b2fc19052e573afdf9f688c62d..0373149e634aad1b83175044407b70327204326f 100644 (file)
@@ -115,7 +115,7 @@ module SiSU_AO
         : @opt.fns
         create_ao
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@per.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@per.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -137,7 +137,7 @@ module SiSU_AO
         ? read_fnc
         : @per.ao_arr.dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -158,7 +158,7 @@ module SiSU_AO
         ? read_idx_sst
         : @per.idx_arr_sst.dup #check
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -179,7 +179,7 @@ module SiSU_AO
         ? read_idx_raw
         : @per.idx_arr_tex.dup #check
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -200,7 +200,7 @@ module SiSU_AO
         ? read_idx_html
         : @per.idx_arr_html.dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -221,7 +221,7 @@ module SiSU_AO
         ? read_idx_xhtml
         : @per.idx_arr_xhtml.dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -242,7 +242,7 @@ module SiSU_AO
         ? read_map_nametags
         : @per.map_arr_nametags.dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
@@ -263,7 +263,7 @@ module SiSU_AO
         ? read_map_ocn_htmlseg
         : @per.map_arr_ocn_htmlseg.dup
       rescue
-        SiSU_Errors::Rescued.new($!,$@,@opt.selection,@opt.fns).location do
+        SiSU_Errors::Rescued.new($!,$@,@opt.selections,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
         end
       ensure
index ba1549adbac583e7200a0658b7e92203ddfd3916..869845967170ae7a2e7bc34c63576994b40cc26b 100644 (file)
@@ -88,7 +88,9 @@ module SiSU_DbText
       arr=(arr.is_a?(String)) ? [ arr ] : arr
       arr.each do |s|
         en << s.scan(/#{Mx[:en_a_o]}\s*(.+?)\s*#{Mx[:en_a_c]}/m)
-        s=s.gsub(/#{Mx[:en_a_o]}\s*(\d+).+?#{Mx[:en_a_c]}/m,'<sup>\1</sup>').
+        s=s.
+          gsub(/#{Mx[:en_a_o]}\s*(\d+).+?#{Mx[:en_a_c]}/m,
+            '<sup>\1</sup>').
           gsub(/#{Mx[:en_b_o]}.+?#{Mx[:en_b_c]}/m,'').
           gsub(/ \s+/m,' ')
         txt_arr << s
@@ -106,7 +108,8 @@ module SiSU_DbText
       arr=(arr.is_a?(String)) ? arr.split(/\n+/m) : arr
       arr.each do |s|
         s=s.gsub(/([*\/_-])\{(.+?)\}\1/m,'\2').
-          gsub(/^(?:block|group|poem|code)\{/m,'').gsub(/^\}(?:block|group|poem|code)/m,'').
+          gsub(/^(?:block|group|poem|code)\{/m,'').
+          gsub(/^\}(?:block|group|poem|code)/m,'').
           gsub(/\A(?:@\S+:\s+.+)\Z/m,'')
         if s =~/^:A~/
           if defined? @md.creator \
index 941452defc0b15f75ea210925fc153e9ee880c35..43509f0e686f70a42d5e8c502049fcd97ff98357 100644 (file)
@@ -1087,7 +1087,7 @@ WOK
         @stub_pod
       end
       def etc
-        defaults[:sisu_etc]                                                      #live/dynamic
+        defaults[:sisu_etc]            #live/dynamic
       end
       def arch
         @sys.dir_arch
@@ -1131,7 +1131,7 @@ WOK
       def webserv_path #testing, check need, remove
         webserv
       end
-      def webserv               #separation required for webrick which cannot use path.output (different requirements as no file is passed)
+      def webserv                      #separation required for webrick which cannot use path.output (different requirements as no file is passed)
         man_path=if @@man_path.nil?
           man_path=if defined? @rc['webserv']['path'] \
           and @rc['webserv']['path'] =~/\S\S+/
@@ -1169,17 +1169,17 @@ WOK
       def webserv_map_pwd #dir
         "#{path.webserv}/#{base_markup_dir_stub}"
       end
-      def webserv_dir           #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+      def webserv_dir                  #fixed/hard path to /www web/presentation directory, on Debian /var/www subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
         defaults[:webserv_dir]
       end
-      def webserv_image         #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
+      def webserv_image                #web/presentation directory, subdirectories are created within it, depending on markup directory stub-name (last segment of markup directory name)
         images=if defined? @rc['webserv']['images']
           @rc['webserv']['images']
         else defaults[:images]
         end
         "#{path.webserv}/#{images}"
       end
-      def output                #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
+      def output                       #web/webserv output directory... subdirectory into which further subdirectories are made based on file names
         r=Px[:lng_lst_rgx]
         u=/.+?\/([^\/]+)(?:\/(?:#{r})$|$)/
         base_stub=@sys.pwd.gsub(u,'\1')
@@ -1197,7 +1197,7 @@ WOK
       def feed_home
         "#{public_output}/#{@rc['webserv']['feed_home']}"
       end
-      def scripts                                                                #used previously only to include tla version info
+      def scripts                      #used previously only to include tla version info
         if defined? @rc['project']['path']
           "#{home}/#{@rc['project']['path']}"
         end
index b33c29f5002777e521d812de0664b9788b9d2acc..f862c46caef8ddef8d05f0d2b17719b4c08b54e5 100644 (file)
@@ -79,9 +79,8 @@ module SiSU_TextRepresentation
         gsub(/#{Mx[:fa_underscore_o]}(.+?)#{Mx[:fa_underscore_c]}/,'\1').
         gsub(/#{Mx[:fa_cite_o]}(.+?)#{Mx[:fa_cite_c]}/,'\1').
         gsub(/#{Mx[:fa_insert_o]}(.+?)#{Mx[:fa_insert_c]}/,'\1').
-        gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strke_c]}/,'\1').
+        gsub(/#{Mx[:fa_strike_o]}(.+?)#{Mx[:fa_strike_c]}/,'\1').
         gsub(/#{Mx[:fa_superscript_o]}(\d+)#{Mx[:fa_superscript_c]}/,'[\1]').
-        gsub(/#{Mx[:fa_superscript_o]}(.+?)#{Mx[:fa_superscript_c]}/,'\1').
         gsub(/#{Mx[:fa_subscript_o]}(.+?)#{Mx[:fa_subscript_c]}/,'\1').
         gsub(/#{Mx[:fa_hilite_o]}(.+?)#{Mx[:fa_hilite_c]}/,'\1').
         gsub(/#{Mx[:gl_o]}#(?:126|152)#{Mx[:gl_c]}/i,'~').
index 854e9ad1785a5bde88797415f9acf2141f001dd5..6def47882bad2f49dc1408dfd3ec29c98c201686 100644 (file)
@@ -461,7 +461,7 @@ module SiSU_Metadata
         def language
           if defined? @md.title.language \
           and @md.title.language
-            ' :language: ' + @md.title.language.join(', ')
+            ' :language: ' + @md.title.language
           else nil
           end
         end