From 1fa2ba3f6e03cbf0a6c8e8a2ce78ce6b7fd40b63 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 29 Jul 2014 19:25:21 -0400 Subject: v5 v6: options, minor fixes --- lib/sisu/v5/options.rb | 8 ++++---- lib/sisu/v6/options.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v5/options.rb b/lib/sisu/v5/options.rb index e90fe668..eede713a 100644 --- a/lib/sisu/v5/options.rb +++ b/lib/sisu/v5/options.rb @@ -277,10 +277,10 @@ module SiSU_Commandline @lngs = q[:lngs] if @files.length > 0 \ and @cmd.empty? \ - and @mod.length==0 #% if no other action called on filename given, default is sisu --v4 -0 [filename(s)] configured as flag default + and @mod.length==0 #% if no other action called on filename given, default is sisu --v5 -0 [filename(s)] configured as flag default shortcut=SiSU_Env::InfoProcessingFlag.new - @mod=['--v4'] - @cmd=shortcut.cf_0 + 'm' + @mod=['--v5'] + @cmd=shortcut.cf_0 + ' --dal' end if @cmd =~/[vVM]/ \ && @cmd !~/-[ku]*v[ku]*$/ @@ -459,7 +459,7 @@ module SiSU_Commandline a.each do |x| y=case x when /0/ - (x=~/^-1\S+/) \ + (x=~/^-0\S+/) \ ? x.gsub(/^-0(\S+)/,shortcut.cf_0 + ' -\1') : x.gsub(/^-0/,shortcut.cf_0 + ' ') when /1/ diff --git a/lib/sisu/v6/options.rb b/lib/sisu/v6/options.rb index c71372e0..b73dd87c 100644 --- a/lib/sisu/v6/options.rb +++ b/lib/sisu/v6/options.rb @@ -277,10 +277,10 @@ module SiSU_Commandline @lngs = q[:lngs] if @files.length > 0 \ and @cmd.empty? \ - and @mod.length==0 #% if no other action called on filename given, default is sisu --v4 -0 [filename(s)] configured as flag default + and @mod.length==0 #% if no other action called on filename given, default is sisu --v5 -0 [filename(s)] configured as flag default shortcut=SiSU_Env::InfoProcessingFlag.new - @mod=['--v4'] - @cmd=shortcut.cf_0 + 'm' + @mod=['--v5'] + @cmd=shortcut.cf_0 + ' --dal' end if @cmd =~/[vVM]/ \ && @cmd !~/-[ku]*v[ku]*$/ @@ -459,7 +459,7 @@ module SiSU_Commandline a.each do |x| y=case x when /0/ - (x=~/^-1\S+/) \ + (x=~/^-0\S+/) \ ? x.gsub(/^-0(\S+)/,shortcut.cf_0 + ' -\1') : x.gsub(/^-0/,shortcut.cf_0 + ' ') when /1/ -- cgit v1.2.3 From a79f98621cca3304c06ab3312603b3314bfe773f Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 29 Jul 2014 19:29:33 -0400 Subject: v5 v6: ensure reset of parsed document directory path * needed in the case of html for some subsequent processing --- lib/sisu/v5/dbi_discrete.rb | 2 ++ lib/sisu/v5/html.rb | 1 + lib/sisu/v5/html_concordance.rb | 1 + lib/sisu/v5/manifest.rb | 1 + lib/sisu/v5/manpage.rb | 1 + lib/sisu/v5/texinfo.rb | 6 +++++- lib/sisu/v5/texpdf.rb | 6 +++++- lib/sisu/v5/xhtml.rb | 1 + lib/sisu/v5/xhtml_epub2.rb | 6 +++++- lib/sisu/v5/xml_docbook5.rb | 1 + lib/sisu/v5/xml_dom.rb | 1 + lib/sisu/v5/xml_fictionbook2.rb | 1 + lib/sisu/v5/xml_odf_odt.rb | 1 + lib/sisu/v5/xml_sax.rb | 1 + lib/sisu/v6/dbi_discrete.rb | 2 ++ lib/sisu/v6/html.rb | 1 + lib/sisu/v6/html_concordance.rb | 1 + lib/sisu/v6/manifest.rb | 1 + lib/sisu/v6/manpage.rb | 1 + lib/sisu/v6/texinfo.rb | 6 +++++- lib/sisu/v6/texpdf.rb | 6 +++++- lib/sisu/v6/xhtml.rb | 1 + lib/sisu/v6/xhtml_epub2.rb | 6 +++++- lib/sisu/v6/xml_docbook5.rb | 1 + lib/sisu/v6/xml_dom.rb | 1 + lib/sisu/v6/xml_fictionbook2.rb | 1 + lib/sisu/v6/xml_odf_odt.rb | 1 + lib/sisu/v6/xml_sax.rb | 1 + 28 files changed, 54 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/sisu/v5/dbi_discrete.rb b/lib/sisu/v5/dbi_discrete.rb index a2aa3d09..9c4726c9 100644 --- a/lib/sisu/v5/dbi_discrete.rb +++ b/lib/sisu/v5/dbi_discrete.rb @@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building @conn=@db.sqlite.conn_sqlite3 rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available') + ensure + Dir.chdir(@opt.f_pth[:pth]) end end end diff --git a/lib/sisu/v5/html.rb b/lib/sisu/v5/html.rb index 13aaf58d..526b41c6 100644 --- a/lib/sisu/v5/html.rb +++ b/lib/sisu/v5/html.rb @@ -91,6 +91,7 @@ module SiSU_HTML ensure SiSU_Env::CreateSite.new(@opt).cp_css SiSU_Env::CreateSite.new(@opt).cp_base_images + Dir.chdir(@opt.f_pth[:pth]) end end def songsheet diff --git a/lib/sisu/v5/html_concordance.rb b/lib/sisu/v5/html_concordance.rb index f336937f..7bbb1a4c 100644 --- a/lib/sisu/v5/html_concordance.rb +++ b/lib/sisu/v5/html_concordance.rb @@ -123,6 +123,7 @@ module SiSU_Concordance end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/manifest.rb b/lib/sisu/v5/manifest.rb index faca95af..1afe1deb 100644 --- a/lib/sisu/v5/manifest.rb +++ b/lib/sisu/v5/manifest.rb @@ -121,6 +121,7 @@ module SiSU_Manifest end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/manpage.rb b/lib/sisu/v5/manpage.rb index 526e0286..a59ba835 100644 --- a/lib/sisu/v5/manpage.rb +++ b/lib/sisu/v5/manpage.rb @@ -120,6 +120,7 @@ module SiSU_Manpage __LINE__.to_s + ':' + __FILE__ end ensure + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/texinfo.rb b/lib/sisu/v5/texinfo.rb index ad8217ed..4c25c1ed 100644 --- a/lib/sisu/v5/texinfo.rb +++ b/lib/sisu/v5/texinfo.rb @@ -100,7 +100,11 @@ module SiSU_TexInfo end end def read - song + begin + song + ensure + Dir.chdir(@opt.f_pth[:pth]) + end end def song begin diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb index 7d12b249..8d6a01c5 100644 --- a/lib/sisu/v5/texpdf.rb +++ b/lib/sisu/v5/texpdf.rb @@ -114,7 +114,11 @@ module SiSU_TeX end end def read - song + begin + song + ensure + Dir.chdir(@opt.f_pth[:pth]) + end end def song begin diff --git a/lib/sisu/v5/xhtml.rb b/lib/sisu/v5/xhtml.rb index 8a7df5f2..e1efeeaf 100644 --- a/lib/sisu/v5/xhtml.rb +++ b/lib/sisu/v5/xhtml.rb @@ -121,6 +121,7 @@ module SiSU_XHTML end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/xhtml_epub2.rb b/lib/sisu/v5/xhtml_epub2.rb index 5f43a9d1..d0b4a7dc 100644 --- a/lib/sisu/v5/xhtml_epub2.rb +++ b/lib/sisu/v5/xhtml_epub2.rb @@ -84,7 +84,11 @@ module SiSU_XHTML_EPUB2 @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt) end def read - songsheet + begin + songsheet + ensure + Dir.chdir(@opt.f_pth[:pth]) + end end def songsheet begin diff --git a/lib/sisu/v5/xml_docbook5.rb b/lib/sisu/v5/xml_docbook5.rb index 829f35be..0870c06e 100644 --- a/lib/sisu/v5/xml_docbook5.rb +++ b/lib/sisu/v5/xml_docbook5.rb @@ -89,6 +89,7 @@ module SiSU_XML_Docbook_Book ensure #SiSU_Env::CreateSite.new(@opt.cmd).cp_css #SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/xml_dom.rb b/lib/sisu/v5/xml_dom.rb index f06aea53..b51a317a 100644 --- a/lib/sisu/v5/xml_dom.rb +++ b/lib/sisu/v5/xml_dom.rb @@ -122,6 +122,7 @@ module SiSU_XML_DOM end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/xml_fictionbook2.rb b/lib/sisu/v5/xml_fictionbook2.rb index 35bccc71..997f0b0a 100644 --- a/lib/sisu/v5/xml_fictionbook2.rb +++ b/lib/sisu/v5/xml_fictionbook2.rb @@ -86,6 +86,7 @@ module SiSU_XML_Fictionbook __LINE__.to_s + ':' + __FILE__ end ensure + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/xml_odf_odt.rb b/lib/sisu/v5/xml_odf_odt.rb index 9bcb29d6..df71ce81 100644 --- a/lib/sisu/v5/xml_odf_odt.rb +++ b/lib/sisu/v5/xml_odf_odt.rb @@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT __LINE__.to_s + ':' + __FILE__ end ensure + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v5/xml_sax.rb b/lib/sisu/v5/xml_sax.rb index 58ac50da..ac2b6d47 100644 --- a/lib/sisu/v5/xml_sax.rb +++ b/lib/sisu/v5/xml_sax.rb @@ -122,6 +122,7 @@ module SiSU_XML_SAX ensure #file closed in songsheet SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/dbi_discrete.rb b/lib/sisu/v6/dbi_discrete.rb index 9e83009e..fc5c310f 100644 --- a/lib/sisu/v6/dbi_discrete.rb +++ b/lib/sisu/v6/dbi_discrete.rb @@ -160,6 +160,8 @@ module SiSU_DBI_Discrete #% database building @conn=@db.sqlite.conn_sqlite3 rescue LoadError SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('sqlite3 not available') + ensure + Dir.chdir(@opt.f_pth[:pth]) end end end diff --git a/lib/sisu/v6/html.rb b/lib/sisu/v6/html.rb index 1e2a51e6..1f6b787d 100644 --- a/lib/sisu/v6/html.rb +++ b/lib/sisu/v6/html.rb @@ -91,6 +91,7 @@ module SiSU_HTML ensure SiSU_Env::CreateSite.new(@opt).cp_css SiSU_Env::CreateSite.new(@opt).cp_base_images + Dir.chdir(@opt.f_pth[:pth]) end end def songsheet diff --git a/lib/sisu/v6/html_concordance.rb b/lib/sisu/v6/html_concordance.rb index 0a927998..0f87ee0b 100644 --- a/lib/sisu/v6/html_concordance.rb +++ b/lib/sisu/v6/html_concordance.rb @@ -123,6 +123,7 @@ module SiSU_Concordance end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/manifest.rb b/lib/sisu/v6/manifest.rb index f426028c..21350938 100644 --- a/lib/sisu/v6/manifest.rb +++ b/lib/sisu/v6/manifest.rb @@ -121,6 +121,7 @@ module SiSU_Manifest end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/manpage.rb b/lib/sisu/v6/manpage.rb index 4a0c978d..4f2bb803 100644 --- a/lib/sisu/v6/manpage.rb +++ b/lib/sisu/v6/manpage.rb @@ -120,6 +120,7 @@ module SiSU_Manpage __LINE__.to_s + ':' + __FILE__ end ensure + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/texinfo.rb b/lib/sisu/v6/texinfo.rb index f17ab1ab..459d3ac5 100644 --- a/lib/sisu/v6/texinfo.rb +++ b/lib/sisu/v6/texinfo.rb @@ -100,7 +100,11 @@ module SiSU_TexInfo end end def read - song + begin + song + ensure + Dir.chdir(@opt.f_pth[:pth]) + end end def song begin diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/v6/texpdf.rb index fd0e9691..2869c59b 100644 --- a/lib/sisu/v6/texpdf.rb +++ b/lib/sisu/v6/texpdf.rb @@ -114,7 +114,11 @@ module SiSU_TeX end end def read - song + begin + song + ensure + Dir.chdir(@opt.f_pth[:pth]) + end end def song begin diff --git a/lib/sisu/v6/xhtml.rb b/lib/sisu/v6/xhtml.rb index 3201834b..dc04e8b2 100644 --- a/lib/sisu/v6/xhtml.rb +++ b/lib/sisu/v6/xhtml.rb @@ -121,6 +121,7 @@ module SiSU_XHTML end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/xhtml_epub2.rb b/lib/sisu/v6/xhtml_epub2.rb index 62cd9caa..e978c15d 100644 --- a/lib/sisu/v6/xhtml_epub2.rb +++ b/lib/sisu/v6/xhtml_epub2.rb @@ -84,7 +84,11 @@ module SiSU_XHTML_EPUB2 @particulars=SiSU_Particulars::CombinedSingleton.instance.get_all(opt) end def read - songsheet + begin + songsheet + ensure + Dir.chdir(@opt.f_pth[:pth]) + end end def songsheet begin diff --git a/lib/sisu/v6/xml_docbook5.rb b/lib/sisu/v6/xml_docbook5.rb index 0a86b0c9..c5be78fe 100644 --- a/lib/sisu/v6/xml_docbook5.rb +++ b/lib/sisu/v6/xml_docbook5.rb @@ -89,6 +89,7 @@ module SiSU_XML_Docbook_Book ensure #SiSU_Env::CreateSite.new(@opt.cmd).cp_css #SiSU_Env::CreateSite.new(@opt.cmd).cp_base_images + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/xml_dom.rb b/lib/sisu/v6/xml_dom.rb index 7532a7f8..b92c2d51 100644 --- a/lib/sisu/v6/xml_dom.rb +++ b/lib/sisu/v6/xml_dom.rb @@ -122,6 +122,7 @@ module SiSU_XML_DOM end ensure SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/xml_fictionbook2.rb b/lib/sisu/v6/xml_fictionbook2.rb index 0029b281..04303145 100644 --- a/lib/sisu/v6/xml_fictionbook2.rb +++ b/lib/sisu/v6/xml_fictionbook2.rb @@ -86,6 +86,7 @@ module SiSU_XML_Fictionbook __LINE__.to_s + ':' + __FILE__ end ensure + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/xml_odf_odt.rb b/lib/sisu/v6/xml_odf_odt.rb index e42776a2..224de6da 100644 --- a/lib/sisu/v6/xml_odf_odt.rb +++ b/lib/sisu/v6/xml_odf_odt.rb @@ -121,6 +121,7 @@ module SiSU_XML_ODF_ODT __LINE__.to_s + ':' + __FILE__ end ensure + Dir.chdir(@opt.f_pth[:pth]) end end private diff --git a/lib/sisu/v6/xml_sax.rb b/lib/sisu/v6/xml_sax.rb index 8e3dec22..68932463 100644 --- a/lib/sisu/v6/xml_sax.rb +++ b/lib/sisu/v6/xml_sax.rb @@ -122,6 +122,7 @@ module SiSU_XML_SAX ensure #file closed in songsheet SiSU_Env::CreateSite.new(@opt).cp_css + Dir.chdir(@opt.f_pth[:pth]) end end private -- cgit v1.2.3