Merge tag 'sisu_5.5.5' into debian/sid

SiSU 5.5.5

35 files changed, 88 insertions, 22 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 74c4def0..e3646e86 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,6 +31,16 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.5.5.orig.tar.xz (2014-07-29:30/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.5.5.orig.tar.xz
+  sisu_5.5.5.orig.tar.xz
+  sisu_5.5.5-1.dsc
+
+* ensure reset of parsed document directory path
+  * needed in the case of html for some subsequent processing
+
 %% 5.5.4.orig.tar.xz (2014-07-24:29/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.5.4
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.5.4-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 290d86cb..cc2f9321 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,6 +21,14 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.1.5.orig.tar.xz (2014-07-29:30/2)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.1.5.orig.tar.xz
+
+* ensure reset of parsed document directory path
+  * needed in the case of html for some subsequent processing
+
 %% 6.1.4.orig.tar.xz (2014-07-24:29/4)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.1.4
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.1.4-1
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 612f2f08..c24ba869 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.5.4
-:date_stamp: 2014w29/4
-:date: "2014-07-24"
+:version: 5.5.5
+:date_stamp: 2014w30/2
+:date: "2014-07-29"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index dc90817a..03c4a1ab 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.1.4
-:date_stamp: 2014w29/4
-:date: "2014-07-24"
+:version: 6.1.5
+:date_stamp: 2014w30/2
+:date: "2014-07-29"
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
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/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/
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
diff --git a/rbuild b/rbuild
index 317af7f4..6f110e36 100644
--- a/rbuild
+++ b/rbuild
@@ -37,8 +37,8 @@
 #require 'mkmf'
 #create_makefile("sisu")
 #% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
-SiSU_version_next_stable     = '5.5.4' #% set version
-SiSU_version_next_unstable   = '6.1.4' #% set version
+SiSU_version_next_stable     = '5.5.5' #% set version
+SiSU_version_next_unstable   = '6.1.5' #% set version
 #% rake file
 SiSU_version_generic_next_stable     = '5.4.x'
 SiSU_version_generic_next_unstable   = '6.0.x'