From 8afb40cad5fbb61ab990612b5d2049702d2f8b7b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 24 Dec 2014 23:42:01 -0500 Subject: c&d: small fixes --- lib/sisu/current/ao.rb | 16 ++++++++-------- lib/sisu/current/se_info_env.rb | 12 ++++++------ lib/sisu/develop/ao.rb | 16 ++++++++-------- lib/sisu/develop/db_sqltxt.rb | 7 +++++-- lib/sisu/develop/se_info_env.rb | 12 ++++++------ lib/sisu/develop/shared_markup_alt.rb | 3 +-- lib/sisu/develop/shared_metadata.rb | 2 +- 7 files changed, 35 insertions(+), 33 deletions(-) diff --git a/lib/sisu/current/ao.rb b/lib/sisu/current/ao.rb index 864d5836..633c4442 100644 --- a/lib/sisu/current/ao.rb +++ b/lib/sisu/current/ao.rb @@ -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 diff --git a/lib/sisu/current/se_info_env.rb b/lib/sisu/current/se_info_env.rb index 8917a1d2..85dd043c 100644 --- a/lib/sisu/current/se_info_env.rb +++ b/lib/sisu/current/se_info_env.rb @@ -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 diff --git a/lib/sisu/develop/ao.rb b/lib/sisu/develop/ao.rb index 747c987e..0373149e 100644 --- a/lib/sisu/develop/ao.rb +++ b/lib/sisu/develop/ao.rb @@ -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 diff --git a/lib/sisu/develop/db_sqltxt.rb b/lib/sisu/develop/db_sqltxt.rb index ba1549ad..86984596 100644 --- a/lib/sisu/develop/db_sqltxt.rb +++ b/lib/sisu/develop/db_sqltxt.rb @@ -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,'\1'). + s=s. + gsub(/#{Mx[:en_a_o]}\s*(\d+).+?#{Mx[:en_a_c]}/m, + '\1'). 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 \ diff --git a/lib/sisu/develop/se_info_env.rb b/lib/sisu/develop/se_info_env.rb index 941452de..43509f0e 100644 --- a/lib/sisu/develop/se_info_env.rb +++ b/lib/sisu/develop/se_info_env.rb @@ -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 diff --git a/lib/sisu/develop/shared_markup_alt.rb b/lib/sisu/develop/shared_markup_alt.rb index b33c29f5..f862c46c 100644 --- a/lib/sisu/develop/shared_markup_alt.rb +++ b/lib/sisu/develop/shared_markup_alt.rb @@ -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,'~'). diff --git a/lib/sisu/develop/shared_metadata.rb b/lib/sisu/develop/shared_metadata.rb index 854e9ad1..6def4788 100644 --- a/lib/sisu/develop/shared_metadata.rb +++ b/lib/sisu/develop/shared_metadata.rb @@ -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 -- cgit v1.2.3