diff options
author | Ralph Amissah <ralph@amissah.com> | 2014-07-29 19:56:22 -0400 |
---|---|---|
committer | Ralph Amissah <ralph@amissah.com> | 2014-07-29 19:56:22 -0400 |
commit | 612f856978e9c2439a3f6fb8164bb9029c4102d2 (patch) | |
tree | 22052eb76ff571d2be243f567437870ba4c217ea /lib/sisu/v5 | |
parent | debian/changelog (5.5.4-1) (diff) | |
parent | v5 v6: ensure reset of parsed document directory path (diff) |
Merge tag 'sisu_5.5.5' into debian/sid
SiSU 5.5.5
Diffstat (limited to 'lib/sisu/v5')
-rw-r--r-- | lib/sisu/v5/dbi_discrete.rb | 2 | ||||
-rw-r--r-- | lib/sisu/v5/html.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/html_concordance.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/manifest.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/manpage.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/options.rb | 8 | ||||
-rw-r--r-- | lib/sisu/v5/texinfo.rb | 6 | ||||
-rw-r--r-- | lib/sisu/v5/texpdf.rb | 6 | ||||
-rw-r--r-- | lib/sisu/v5/xhtml.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/xhtml_epub2.rb | 6 | ||||
-rw-r--r-- | lib/sisu/v5/xml_docbook5.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/xml_dom.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/xml_fictionbook2.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/xml_odf_odt.rb | 1 | ||||
-rw-r--r-- | lib/sisu/v5/xml_sax.rb | 1 |
15 files changed, 31 insertions, 7 deletions
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/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/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 |