Merge tag 'sisu_5.4.5' into debian/sid

SiSU 5.4.5

12 files changed, 296 insertions, 187 deletions

diff --git a/README b/README
index bb410a5a..9d0ce281 100644
--- a/README
+++ b/README
@@ -81,9 +81,9 @@ specify sisu version for sisu installed via gem
 
   gem search sisu
 
-  sisu _5.3.3_ --version
+  sisu _5.4.5_ --version
 
-  sisu _6.0.3_ --version
+  sisu _6.0.11_ --version
 
 to uninstall sisu installed via gem
 
diff --git a/bin/sisu b/bin/sisu
index c53438f3..51840e07 100644
--- a/bin/sisu
+++ b/bin/sisu
@@ -28,7 +28,8 @@ class Orient
     and File.dirname(processing.file_full_path) != Config::CONFIG['bindir']
       :full_path_to_sisu_bin_in_sisu_dir_tree
     elsif processing.file_full_path =~/\/gems\// \
-    and  processing.file_full_path =~/\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
+    and processing.file_full_path \
+    =~ /\/sisu-[#{version.stable}#{version.unstable}]\.(?:\d+|[a-z])\.(?:\d+|[a-z])\//
       :gem_install
     else
       :system_install
@@ -113,11 +114,14 @@ class Orient
   end
   def paths_set
     if sisu_run_from == :system_install \
-    and processing.called_as =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/
+    and processing.called_as \
+    =~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/
       :set_path_system
     elsif sisu_run_from == :full_path_to_sisu_bin_in_sisu_dir_tree \
-    and processing.called_as !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \
-    && File.expand_path(processing.called_as) =~/bin\/sisu[#{version.stable}#{version.unstable}]?$/ \
+    and processing.called_as \
+    !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/ \
+    && File.expand_path(processing.called_as) \
+    =~ /bin\/sisu[#{version.stable}#{version.unstable}]?$/ \
     && FileTest.file?(processing.called_as)
       :set_dir_tree_full_path
     elsif sisu_run_from==:gem_install
@@ -130,7 +134,8 @@ class Orient
     when :set_path_system
       Config::CONFIG['datadir'] + '/sisu'
     when :set_dir_tree_full_path
-      File.expand_path(processing.called_as).sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'')
+      File.expand_path(processing.called_as).
+        sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'')
     when :set_gem_path
       Gem::Specification.find_by_name("sisu").gem_dir
     else nil
@@ -141,15 +146,18 @@ class Orient
     when :set_path_system
       Config::CONFIG['datadir'] + '/sisu'
     when :set_dir_tree_full_path
-      File.expand_path(processing.called_as).sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu')
+      File.expand_path(processing.called_as).
+        sub(/\/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'/data/sisu')
     when :set_gem_path
       Gem::Specification.find_by_name("sisu").gem_dir + '/data/sisu'
     else nil
     end
   end
   def sisu_path_specified_lib
-    if (processing.called_as !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/)
-      File.expand_path(processing.called_as).sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib')
+    if (processing.called_as \
+    !~ /^#{Config::CONFIG['bindir']}\/sisu[#{version.stable}#{version.unstable}]?$/)
+      File.expand_path(processing.called_as).
+        sub(/bin\/sisu[#{version.stable}#{version.unstable}]?$/,'lib')
     else nil
     end
   end
@@ -183,7 +191,9 @@ class Orient
             command_line_modifiers << x
           elsif x =~/\.ss[tm]/
             if x =~/\//
-              markup_path,markup_file =(/(\S+\/)((?:#{language_list.regex})?[^\/]+)/).match(x)[1,2]
+              markup_path,markup_file =
+                (/(\S+\/)((?:#{language_list.regex})?[^\/]+)/).
+                match(x)[1,2]
               if not processing_files[markup_path]
                 processing_files[markup_path]=[]
               end
@@ -212,32 +222,40 @@ class Orient
   end
   def control
     require "#{sisu_is[:path_lib]}/hub"
-    if get_processing_info.processing_files. length > 0
+    sisu_called_from_directory
+    if get_processing_info.processing_files.length > 0
       get_processing_info.processing_files.each_pair do |markup_dir,markup_file|
-        $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'')
-        argv_sub=get_processing_info.command_line_modifiers + markup_file
-        if FileTest.directory?(markup_dir)
-          system("cd #{markup_dir}")
-          Dir.chdir(markup_dir)
-          $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
-          SiSU::HubMaster.new(argv_sub)
-        elsif markup_dir =~/https?:/
-          markup_file.each do |mf|
-            (FileTest.file?(mf)) \
-            ? (puts 'requested remote file already exists in current directory ' + Dir.pwd + ' using ' + mf)
-            : (system("wget #{markup_dir}/#{mf}"))
+        begin
+          $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'')
+          argv_sub=get_processing_info.command_line_modifiers + markup_file
+          if FileTest.directory?(markup_dir)
+            system("cd #{markup_dir}")
+            Dir.chdir(markup_dir)
+            $sisu_document_markup_directory_base_fixed_path=
+              Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
+            SiSU::HubMaster.new(argv_sub)
+          elsif markup_dir =~/https?:/
+            markup_file.each do |mf|
+              (FileTest.file?(mf)) \
+              ? (puts 'requested remote file already exists in current directory ' \
+                + Dir.pwd + ' using ' + mf)
+              : (system("wget #{markup_dir}/#{mf}"))
+            end
+            $sisu_document_markup_directory_base_fixed_path=
+              Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
+            argv_sub=command_line_modifiers + markup_file
+            SiSU::HubMaster.new(argv_sub)
+          else p "Error directory specified #{markup_dir} not found"
           end
-          $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/\/(?:#{language_list.regex})$/,'')
-          argv_sub=command_line_modifiers + markup_file
-          SiSU::HubMaster.new(argv_sub)
-        else p "Error directory specified #{markup_dir} not found"
+        ensure
+          Dir.chdir(sisu_called_from_directory)
+          system("cd #{sisu_called_from_directory}")
         end
-        Dir.chdir(sisu_called_from_directory)
-        system("cd #{sisu_called_from_directory}")
       end
     else
       $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'')
-      $sisu_document_markup_directory_base_fixed_path=Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')
+      $sisu_document_markup_directory_base_fixed_path=
+        Dir.pwd.gsub(/(^|\/)(?:#{language_list.regex})$/,'')
       SiSU::HubMaster.new(processing.argv)
     end
   end
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 2e3e84f8..eba3b432 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -31,19 +31,42 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 5.4.5.orig.tar.xz (2014-07-07:27/1)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.5-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.5.orig.tar.xz
+  sisu_5.4.5.orig.tar.xz
+  sisu_5.4.5-1.dsc
+
+* bin/sisu,
+  * processing dir related
+    e.g. using live-manual/manual as sample, the following should work as
+    expected, available: ca de en es fr it ja pl pt_BR ro; select: en & ja:
+      sisu --html -v en/live-manual.ssm ja/live-manual.ssm
+    or for all available translations:
+      sisu --html -v **/live-manual.ssm
+    (these previously would have broken after processing the first directory)
+    sisu command equivalent for all available translations being (unaffected):
+      sisu --html -v --glob live-manual
+  * some cosmetic long line breaking
+
+* ao, auto seg naming, adjustments,
+  re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
+
 %% 5.4.4.orig.tar.xz (2014-07-04:26/5)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.4
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.4-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.4.orig.tar.xz
   sisu_5.4.4.orig.tar.xz
   sisu_5.4.4-1.dsc
 
-* ao, fix, re seg numbering, fixed width, leading zeros (introduced in 5.4.3)
-  provisional fix (check related issues against 5.4.2)
+* ao, fix, re seg numbering, fixed width, leading zeros
+  (introduced: 5.4.3 / 6.0.9)
+  provisional fix (check related issues against 5.4.2 / 6.0.8)
 
 %% 5.4.3.orig.tar.xz (2014-07-01:26/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.3
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.3-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.3.orig.tar.xz
   sisu_5.4.3.orig.tar.xz
   sisu_5.4.3-1.dsc
@@ -81,8 +104,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.3.orig.tar.xz
 * epub, a fix, double check
 
 %% 5.4.2.orig.tar.xz (2014-06-22:24/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.2
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.2-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.2.orig.tar.xz
   sisu_5.4.2.orig.tar.xz
   sisu_5.4.2-1.dsc
@@ -91,8 +114,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.2.orig.tar.xz
   ao_doc_str (codeblock)
 
 %% 5.4.1.orig.tar.xz (2014-06-19:24/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.1
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.1-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.1.orig.tar.xz
   sisu_5.4.1.orig.tar.xz
   sisu_5.4.1-1.dsc
@@ -106,8 +129,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.1.orig.tar.xz
   * misc, minorish
 
 %% 5.4.0.orig.tar.xz (2014-05-25:20/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.4.0
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.4.0-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.4.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.4.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.0.orig.tar.xz
   sisu_5.4.0.orig.tar.xz
   sisu_5.4.0-1.dsc
@@ -160,8 +183,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.4.0.orig.tar.xz
   * xml object citation numbering (docbook fictionbook)
 
 %% 5.3.6.orig.tar.xz (2014-05-18:19/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.6
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.6-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.6
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.6-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.6.orig.tar.xz
   sisu_5.3.6.orig.tar.xz
   sisu_5.3.6-1.dsc
@@ -178,8 +201,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.6.orig.tar.xz
   * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
 
 %% 5.3.5.orig.tar.xz (2014-05-12:19/1)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.5
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.5-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.5-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz
   sisu_5.3.5.orig.tar.xz
   sisu_5.3.5-1.dsc
@@ -208,8 +231,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.5.orig.tar.xz
 * added sisu.org emacs:evil:org mode notes related to sisu development
 
 %% 5.3.4.orig.tar.xz (2014-02-14:06/5)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.4
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.4-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.4.orig.tar.xz
   sisu_5.3.4.orig.tar.xz
   sisu_5.3.4-1.dsc
@@ -219,8 +242,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.4.orig.tar.xz
   * plaintext & odt switch default to ocn==true for consistency
 
 %% 5.3.3.orig.tar.xz (2014-02-08:05/6)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.3
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.3-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.3.orig.tar.xz
   sisu_5.3.3.orig.tar.xz
   sisu_5.3.3-1.dsc
@@ -234,8 +257,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.3.orig.tar.xz
 * documentation, minor update
 
 %% 5.3.2.orig.tar.xz (2014-02-05:05/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.2
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.2-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.2.orig.tar.xz
   sisu_5.3.2.orig.tar.xz
   sisu_5.3.2-1.dsc
@@ -249,8 +272,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.2.orig.tar.xz
 * manual Rakefile, README & minor config adjustment
 
 %% 5.3.1.orig.tar.xz (2014-02-05:05/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.1
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.1-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.1.orig.tar.xz
   sisu_5.3.1.orig.tar.xz
   sisu_5.3.1-1.dsc
@@ -286,8 +309,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.1.orig.tar.xz
   * removed html man pages (man2html)
 
 %% 5.3.0.orig.tar.xz (2014-01-26:03/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.0
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.0-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.3.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.3.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.0.orig.tar.xz
   sisu_5.3.0.orig.tar.xz
   sisu_5.3.0-1.dsc
@@ -298,8 +321,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.0.orig.tar.xz
   * v6 development branch opened (copy v5) (>=6.0.0)
 
 %% 5.2.4.orig.tar.xz (2014-01-26:03/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.4
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.4-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.4.orig.tar.xz
   sisu_5.2.4.orig.tar.xz
   sisu_5.2.4-1.dsc
@@ -307,8 +330,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.4.orig.tar.xz
 * bin/sisu changes to simplify switching to new stable and development branches
 
 %% 5.2.3.orig.tar.xz (2014-01-20:03/1)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.3
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.3-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.3.orig.tar.xz
   sisu_5.2.3.orig.tar.xz
   sisu_5.2.3-1.dsc
@@ -321,8 +344,8 @@ introducing v6 for development, proposed for this release + 1]
 * sysenv for texpdf, fix for when tex to pdf generator is absent
 
 %% 5.2.2.orig.tar.xz (2014-01-17:02/5)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.2
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.2-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.2.orig.tar.xz
   sisu_5.2.2.orig.tar.xz
   sisu_5.2.2-1.dsc
@@ -332,8 +355,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.2.orig.tar.xz
   * work on fix for bug related to gem path & system installed sisu
 
 %% 5.2.1.orig.tar.xz (2014-01-12:01/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.1
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.1-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.1.orig.tar.xz
   sisu_5.2.1.orig.tar.xz
   sisu_5.2.1-1.dsc
@@ -351,8 +374,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.1.orig.tar.xz
 * asciidoc, file extension (for now .ad), inline footnotes, minor
 
 %% 5.2.0.orig.tar.xz (2014-01-06:01/1)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.0
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.0-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.2.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.2.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.0.orig.tar.xz
   sisu_5.2.0.orig.tar.xz
   sisu_5.2.0-1.dsc
@@ -404,8 +427,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.0.orig.tar.xz
 * year updated, code headers
 
 %% 5.1.3.orig.tar.xz (2013-12-15:49/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.3
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.3-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.3.orig.tar.xz
   sisu_5.1.3.orig.tar.xz
   sisu_5.1.3-1.dsc
@@ -413,8 +436,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.3.orig.tar.xz
 * Rakefile, (installer), reduce actions
 
 %% 5.1.2.orig.tar.xz (2013-12-09:49/1)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.2
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.2-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.2.orig.tar.xz
   sisu_5.1.2.orig.tar.xz
   sisu_5.1.2-1.dsc
@@ -427,8 +450,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.2.orig.tar.xz
 [NOTE disk crash (2013-12-05), fairly good but incomplete backup affecting work]
 
 %% 5.1.1.orig.tar.xz (2013-12-03:48/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.1
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.1-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.1.orig.tar.xz
   sisu_5.1.1.orig.tar.xz
   sisu_5.1.1-1.dsc
@@ -440,8 +463,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.1.orig.tar.xz
 * bin/sisu, simplify in relation to sisu gem
 
 %% 5.1.0.orig.tar.xz (2013-12-02:48/1)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.0
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.0-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.1.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.1.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.0.orig.tar.xz
   sisu_5.1.0.orig.tar.xz
   sisu_5.1.0-1.dsc
@@ -507,8 +530,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.0.orig.tar.xz
 * documentation related to commands for new outputs in development
 
 %% 5.0.25.orig.tar.xz (2013-11-08:44/5)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.25
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.25-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.25
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.25-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.25.orig.tar.xz
   sisu_5.0.25.orig.tar.xz
   sisu_5.0.25-1.dsc
@@ -526,8 +549,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.25.orig.tar.xz
   * add sisu-html-scroll, sisu-html-seg, sisu-pdf-portrait, sisu-pdf-landscape
 
 %% 5.0.24.orig.tar.xz (2013-11-05:44/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.24
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.24-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.24
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.24-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.24.orig.tar.xz
   sisu_5.0.24.orig.tar.xz
   sisu_5.0.24-1.dsc
@@ -535,8 +558,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.24.orig.tar.xz
 * xml, scaffold, re-activated, split into sisu structure & collapsed structure
 
 %% 5.0.23.orig.tar.xz (2013-11-02:43/6)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.23
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.23-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.23
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.23-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.23.orig.tar.xz
   sisu_5.0.23.orig.tar.xz
   sisu_5.0.23-1.dsc
@@ -548,8 +571,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.23.orig.tar.xz
   * reorganize
 
 %% 5.0.22.orig.tar.xz (2013-10-27:42/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.22
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.22-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.22
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.22-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.22.orig.tar.xz
   sisu_5.0.22.orig.tar.xz
   sisu_5.0.22-1.dsc
@@ -557,8 +580,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.22.orig.tar.xz
 * dal, document_structure_check_info
 
 %% 5.0.21.orig.tar.xz (2013-10-23:42/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.21
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.21-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.21
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.21-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.21.orig.tar.xz
   sisu_5.0.21.orig.tar.xz
   sisu_5.0.21-1.dsc
@@ -574,8 +597,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.21.orig.tar.xz
   markup with straight linear structure
 
 %% 5.0.20.orig.tar.xz (2013-10-17:41/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.20
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.20-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.20
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.20-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.20.orig.tar.xz
   sisu_5.0.20.orig.tar.xz
   sisu_5.0.20-1.dsc
@@ -585,8 +608,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.20.orig.tar.xz
   of use in ordinary (marked up) text)
 
 %% 5.0.19.orig.tar.xz (2013-10-16:41/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.19
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.19-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.19
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.19-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.19.orig.tar.xz
   sisu_5.0.19.orig.tar.xz
   sisu_5.0.19-1.dsc
@@ -599,8 +622,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.19.orig.tar.xz
 * markup sample, update book index markup, appearance, minor
 
 %% 5.0.18.orig.tar.xz (2013-09-22:37/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.18
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.18-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.18
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.18-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.18.orig.tar.xz
   sisu_5.0.18.orig.tar.xz
   sisu_5.0.18-1.dsc
@@ -608,8 +631,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.18.orig.tar.xz
 * bin/sisu update language list ja ko zh, fix
 
 %% 5.0.17.orig.tar.xz (2013-09-21:37/6)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.17
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.17-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.17
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.17-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.17.orig.tar.xz
   sisu_5.0.17.orig.tar.xz
   sisu_5.0.17-1.dsc
@@ -635,8 +658,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.17.orig.tar.xz
 * minor cleaning
 
 %% 5.0.16.orig.tar.xz (2013-09-07:35/6)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.16
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.16-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.16
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.16-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.16.orig.tar.xz
   sisu_5.0.16.orig.tar.xz
   sisu_5.0.16-1.dsc
@@ -646,8 +669,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.16.orig.tar.xz
 * db, book index, convert hash back to string
 
 %% 5.0.15.orig.tar.xz (2013-09-05:35/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.15
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.15-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.15
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.15-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.15.orig.tar.xz
   sisu_5.0.15.orig.tar.xz
   sisu_5.0.15-1.dsc
@@ -661,8 +684,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.15.orig.tar.xz
 * vim syntax, book index markup, hilight delimeters
 
 %% 5.0.14.orig.tar.xz (2013-08-28:34/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.14
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.14-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.14
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.14-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
   sisu_5.0.14.orig.tar.xz
   sisu_5.0.14-1.dsc
@@ -683,8 +706,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.14.orig.tar.xz
 * odf:odt, footnotes, fix
 
 %% 5.0.13.orig.tar.xz (2013-08-25:33/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.13
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.13-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.13
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.13-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.13.orig.tar.xz
   sisu_5.0.13.orig.tar.xz
   sisu_5.0.13-1.dsc
@@ -700,8 +723,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.13.orig.tar.xz
   review further)
 
 %% 5.0.12.orig.tar.xz (2013-08-21:33/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.12
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.12-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.12
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.12-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.12.orig.tar.xz
   sisu_5.0.12.orig.tar.xz
   sisu_5.0.12-1.dsc
@@ -726,8 +749,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.12.orig.tar.xz
   * fuchsia (sp.)
 
 %% 5.0.11.orig.tar.xz (2013-08-08:31/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.11
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.11-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.11
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.11-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.11.orig.tar.xz
   sisu_5.0.11.orig.tar.xz
   sisu_5.0.11-1.dsc
@@ -735,8 +758,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.11.orig.tar.xz
 * dal_expand_insertions, refinement for monolingual output
 
 %% 5.0.10.orig.tar.xz (2013-08-08:31/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.10
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.10-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.10
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.10-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.10.orig.tar.xz
   sisu_5.0.10.orig.tar.xz
   sisu_5.0.10-1.dsc
@@ -744,8 +767,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.10.orig.tar.xz
 * output structure by, multilingual, monolingual filenames tweak
 
 %% 5.0.9.orig.tar.xz (2013-08-01:30/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.9
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.9-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.9
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.9-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.9.orig.tar.xz
   sisu_5.0.9.orig.tar.xz
   sisu_5.0.9-1.dsc
@@ -755,8 +778,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.9.orig.tar.xz
 * concordance, fix
 
 %% 5.0.8.orig.tar.xz (2013-07-30:30/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.8
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.8-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.8
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.8-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.8.orig.tar.xz
   sisu_5.0.8.orig.tar.xz
   sisu_5.0.8-1.dsc
@@ -783,8 +806,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.8.orig.tar.xz
   * monolingual output search form option
 
 %% 5.0.7.orig.tar.xz (2013-06-25:25/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.7
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.7-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.7
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.7-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.7.orig.tar.xz
   sisu_5.0.7.orig.tar.xz
   sisu_5.0.7-1.dsc
@@ -792,8 +815,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.7.orig.tar.xz
 * "general code cleaning" fix
 
 %% 5.0.6.orig.tar.xz (2013-06-25:25/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.6
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.6-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.6
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.6-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.6.orig.tar.xz
   sisu_5.0.6.orig.tar.xz
   sisu_5.0.6-1.dsc
@@ -801,8 +824,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.6.orig.tar.xz
 * "general code cleaning" fix
 
 %% 5.0.5.orig.tar.xz (2013-06-22:24/6)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.5
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.5-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.5-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.5.orig.tar.xz
   sisu_5.0.5.orig.tar.xz
   sisu_5.0.5-1.dsc
@@ -814,8 +837,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.5.orig.tar.xz
 * general code cleaning, propagate back to v4 after testing
 
 %% 5.0.4.orig.tar.xz (2013-06-06:22/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.4
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.4-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.4.orig.tar.xz
   sisu_5.0.4.orig.tar.xz
   sisu_5.0.4-1.dsc
@@ -831,8 +854,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.4.orig.tar.xz
 * sysenv, requested load warning removed, less screen clutter, consider
 
 %% 5.0.3.orig.tar.xz (2013-05-30:21/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.3
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.3-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.3.orig.tar.xz
   sisu_5.0.3.orig.tar.xz
   sisu_5.0.3-1.dsc
@@ -842,8 +865,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.3.orig.tar.xz
 * cgi_pgsql, cgi helper script, sample search form generator, detail
 
 %% 5.0.2.orig.tar.xz (2013-05-29:21/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.2
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.2-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.2.orig.tar.xz
   sisu_5.0.2.orig.tar.xz
   sisu_5.0.2-1.dsc
@@ -866,8 +889,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.2.orig.tar.xz
     db user (pg)                    --db-user=''
 
 %% 5.0.1.orig.tar.xz (2013-05-18:19/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.1
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.1-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.1.orig.tar.xz
   sisu_5.0.1.orig.tar.xz
   sisu_5.0.1-1.dsc
@@ -878,8 +901,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.1.orig.tar.xz
   'sisu -F')
 
 %% 5.0.0.orig.tar.xz (2013-05-08:18/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.0.0
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.0.0-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_5.0.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_5.0.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_5.0.0.orig.tar.xz
   sisu_5.0.0.orig.tar.xz
   sisu_5.0.0-1.dsc
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index f9d9a62d..eef28547 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -21,19 +21,42 @@ v2 branch is removed; it is available in sisu =< 3.3.2
 
 %% Reverse Chronological:
 
+%% 6.0.11.orig.tar.xz (2014-07-07:27/1)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.11
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.11-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.11.orig.tar.xz
+  sisu_6.0.11.orig.tar.xz
+  sisu_6.0.11-1.dsc
+
+* bin/sisu,
+  * processing dir related
+    e.g. using live-manual/manual as sample, the following should work as
+    expected, available: ca de en es fr it ja pl pt_BR ro; select: en & ja:
+      sisu --html -v en/live-manual.ssm ja/live-manual.ssm
+    or for all available translations:
+      sisu --html -v **/live-manual.ssm
+    (these previously would have broken after processing the first directory)
+    sisu command equivalent for all available translations being (unaffected):
+      sisu --html -v --glob live-manual
+  * some cosmetic long line breaking
+
+* ao, auto seg naming, adjustments,
+  re: seg numbering, fixed width, leading zeros (introduced: 5.4.3 / 6.0.9)
+
 %% 6.0.10.orig.tar.xz (2014-07-04:26/5)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.10
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.10-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.10
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.10-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.10.orig.tar.xz
   sisu_6.0.10.orig.tar.xz
   sisu_6.0.10-1.dsc
 
-* ao, fix, re seg numbering, fixed width, leading zeros (introduced in 6.0.9)
-  provisional fix (check related issues against 5.4.2)
+* ao, fix, re seg numbering, fixed width, leading zeros
+  (introduced: 5.4.3 / 6.0.9)
+  provisional fix (check related issues against 5.4.2 / 6.0.8)
 
 %% 6.0.9.orig.tar.xz (2014-07-01:26/2)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.9
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.9-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.9
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.9-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.9.orig.tar.xz
   sisu_6.0.9.orig.tar.xz
   sisu_6.0.9-1.dsc
@@ -54,8 +77,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.9.orig.tar.xz
 * epub, a fix, double check
 
 %% 6.0.8.orig.tar.xz (2014-06-19:24/4)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.8
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.8-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.8
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.8-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.8.orig.tar.xz
   sisu_6.0.8.orig.tar.xz
   sisu_6.0.8-1.dsc
@@ -85,15 +108,15 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.8.orig.tar.xz
   * quote block
 
 %% 6.0.7.orig.tar.xz (2014-05-25:20/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.7
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.7-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.7
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.7-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.7.orig.tar.xz
   sisu_6.0.7.orig.tar.xz
   sisu_6.0.7-1.dsc
 
 %% 6.0.6.orig.tar.xz (2014-05-18:19/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.6
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.6-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.6
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.6-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.6.orig.tar.xz
   sisu_6.0.6.orig.tar.xz
   sisu_6.0.6-1.dsc
@@ -110,8 +133,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.6.orig.tar.xz
   * for sqlite: require 'sqlite3' (use ruby-sqlite3 directly)
 
 %% 6.0.5.orig.tar.xz (2014-05-12:19/1)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.5
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.5-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.5
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.5-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz
   sisu_6.0.5.orig.tar.xz
   sisu_6.0.5-1.dsc
@@ -185,8 +208,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.5.orig.tar.xz
 * added sisu.org emacs:evil:org mode notes related to sisu development
 
 %% 6.0.4.orig.tar.xz (2014-02-14:06/5)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.4
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.4-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.4
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.4-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.4.orig.tar.xz
   sisu_6.0.4.orig.tar.xz
   sisu_6.0.4-1.dsc
@@ -196,8 +219,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.4.orig.tar.xz
   * plaintext & odt switch default to ocn==true for consistency
 
 %% 6.0.3.orig.tar.xz (2014-02-08:05/6)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.3
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.3-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.3
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.3-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.3.orig.tar.xz
   sisu_6.0.3.orig.tar.xz
   sisu_6.0.3-1.dsc
@@ -211,8 +234,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.3.orig.tar.xz
 * documentation, minor update
 
 %% 6.0.2.orig.tar.xz (2014-02-05:05/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.2
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.2-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.2
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.2-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.2.orig.tar.xz
   sisu_6.0.2.orig.tar.xz
   sisu_6.0.2-1.dsc
@@ -226,8 +249,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.2.orig.tar.xz
 * manual Rakefile, README & minor config adjustment
 
 %% 6.0.1.orig.tar.xz (2014-02-05:05/3)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.1
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.1-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.1-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.1.orig.tar.xz
   sisu_6.0.1.orig.tar.xz
   sisu_6.0.1-1.dsc
@@ -263,8 +286,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.1.orig.tar.xz
   * removed html man pages (man2html)
 
 %% 6.0.0.orig.tar.xz (2014-01-26:03/7)
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.0
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.0-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_6.0.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_6.0.0-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.0.orig.tar.xz
   sisu_6.0.0.orig.tar.xz
   sisu_6.0.0-1.dsc
diff --git a/data/doc/sisu/sisu.org b/data/doc/sisu/sisu.org
index 83e74f11..265abda9 100644
--- a/data/doc/sisu/sisu.org
+++ b/data/doc/sisu/sisu.org
@@ -45,9 +45,44 @@ are not taken care of for you.
 RUN OFF SOURCE PACKAGE DIRECTORY TREE (WITHOUT INSTALLING)
 ..........................................................
 
-1. Obtain the latest sisu source
+***** 1. Obtain the latest sisu source
 
-2. Unpack the source
+using git:
+
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log
+
+  git clone git://sources.sisudoc.org/git/code/sisu.git
+
+or, identify latest available source:
+
+https://packages.debian.org/sid/sisu
+http://packages.qa.debian.org/s/sisu.html
+http://qa.debian.org/developer.php?login=sisu@lists.sisudoc.org
+
+http://sisudoc.org/sisu/archive/pool/main/s/sisu/
+
+and download the:
+
+  sisu_5.4.5.orig.tar.xz
+
+using debian tool dget:
+
+The dget tool is included within the devscripts package
+https://packages.debian.org/search?keywords=devscripts
+to install dget install devscripts:
+
+  apt-get install devscripts
+
+and then you can get it from Debian:
+  dget -xu http://ftp.fi.debian.org/debian/pool/main/s/sisu/sisu_5.4.5-1.dsc
+
+or off sisu repos
+  dget -x http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
+or
+  dget -x http://sisudoc.org/sisu/archive/pool/main/s/sisu/sisu_5.4.5-1.dsc
+
+***** 2. Unpack the source
 
 Provided you have *Ruby*, *SiSU* can be run without installation straight from
 the source package directory tree.
@@ -56,6 +91,8 @@ Run ruby against the full path to bin/sisu (in the unzipped source package
 directory tree). SiSU should be run from the directory containing your sisu
 marked up document set.
 
+  ruby ~/sisu-5.4.5/bin/sisu --html -v document_name.sst
+
 This works fine so long as you already have sisu external dependencies in
 place. For many operations such as html, epub, odt this is likely to be fine.
 Note however, that additional external package dependencies, such as texlive
@@ -88,9 +125,9 @@ specify sisu version for sisu installed via gem
 
   gem search sisu
 
-  sisu _5.3.6_ --version
+  sisu _5.4.5_ --version
 
-  sisu _6.0.6_ --version
+  sisu _6.0.11_ --version
 
 to uninstall sisu installed via gem
 
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index ef86ff92..281ad1fd 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 5.4.4
-:date_stamp: 2014w26/5
-:date: "2014-07-04"
+:version: 5.4.5
+:date_stamp: 2014w27/1
+:date: "2014-07-07"
diff --git a/data/sisu/v6/v/version.yml b/data/sisu/v6/v/version.yml
index fa44ea93..8670e0fe 100644
--- a/data/sisu/v6/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
 ---
 :project: SiSU
-:version: 6.0.10
-:date_stamp: 2014w26/5
-:date: "2014-07-04"
+:version: 6.0.11
+:date_stamp: 2014w27/1
+:date: "2014-07-07"
diff --git a/lib/sisu/v5/ao_numbering.rb b/lib/sisu/v5/ao_numbering.rb
index 9fbaaab5..278ea514 100644
--- a/lib/sisu/v5/ao_numbering.rb
+++ b/lib/sisu/v5/ao_numbering.rb
@@ -308,27 +308,30 @@ module SiSU_AO_Numbering
         zeros_fixed_width=number_of_segments?.to_s.length
         zero_width=(zeros_fixed_width - nl)
         zero_width == 0 \
-        ? Mx[:auto_seg_prefix] +
-          possible_seg_name.to_s
-        : Mx[:auto_seg_prefix] +
-          zero*zero_width +
+        ? possible_seg_name.to_s
+        : zero*zero_width +
           possible_seg_name.to_s
       end
     end
-    def auto_seg_name(possible_seg_name,heading_num_is)
+    def auto_seg_name(possible_seg_name,heading_num_is,type)
+      prefix=case type
+      when :auto then    Mx[:segname_prefix_auto_num_provide]
+      when :extract then Mx[:segname_prefix_auto_num_extract]
+      else               '_' #should not occur
+      end
       if possible_seg_name =~/^[0-9]+?\.$/m                                  #!~/[.,:-]+/
         possible_seg_name=possible_seg_name.
           gsub(/\.$/,'')
       end
       if possible_seg_name =~/^[0-9]+$/m \
       and possible_seg_name.to_i <= heading_num_is.to_i
-        leading_zeros_fixed_width_number(possible_seg_name)
+        prefix + leading_zeros_fixed_width_number(possible_seg_name)
       elsif possible_seg_name =~/^[\d.,:-]+$/m
         possible_seg_name=possible_seg_name.
           gsub(/(?:[:,-]|\W)/,'.').
           gsub(/\.$/,'')
-        #Mx[:auto_seg_prefix] + possible_seg_name
-      else possible_seg_name.to_s
+        prefix + possible_seg_name
+      else prefix + possible_seg_name.to_s
       end
     end
     def name_para_seg_filename(data)                                                   #segment naming, remaining
@@ -369,7 +372,7 @@ module SiSU_AO_Numbering
           and dob.obj =~/^\s*(?:\S+\s+)?([\d.,:-]+)/m      #heading starts with a recognised numeric or word followed by a recognised numeric construct, use that as name
             possible_seg_name=$1
             possible_seg_name=
-              auto_seg_name(possible_seg_name,heading_num_is)
+              auto_seg_name(possible_seg_name,heading_num_is,:extract)
             possible_seg_name=possible_seg_name.
               gsub(/(?:[:,-]|\W)/,'.').
               gsub(/\.$/,'')
@@ -394,7 +397,7 @@ module SiSU_AO_Numbering
           if dob.ln==4 \
           and not dob.name                                 #if still no segment name, provide a numerical one
             possible_seg_name=
-              auto_seg_name(art_filename_auto,heading_num_is)
+              auto_seg_name(art_filename_auto,heading_num_is,:auto)
             if @md.seg_names.is_a?(Array) \
             and not @md.seg_names.include?(possible_seg_name)
              dob.name=possible_seg_name
diff --git a/lib/sisu/v5/constants.rb b/lib/sisu/v5/constants.rb
index eb252fda..05678b32 100644
--- a/lib/sisu/v5/constants.rb
+++ b/lib/sisu/v5/constants.rb
@@ -104,7 +104,8 @@ Xx={
   html_relative1:            '※',
 }
 Mx={
-  auto_seg_prefix:           's',
+  segname_prefix_auto_num_extract: 's',
+  segname_prefix_auto_num_provide: 's_',
   ocn_id_char:               'o',
   note:                      'note_',
   note_ref:                  'noteref_',
diff --git a/lib/sisu/v6/ao_numbering.rb b/lib/sisu/v6/ao_numbering.rb
index 755db795..ffafbf9c 100644
--- a/lib/sisu/v6/ao_numbering.rb
+++ b/lib/sisu/v6/ao_numbering.rb
@@ -308,27 +308,30 @@ module SiSU_AO_Numbering
         zeros_fixed_width=number_of_segments?.to_s.length
         zero_width=(zeros_fixed_width - nl)
         zero_width == 0 \
-        ? Mx[:auto_seg_prefix] +
-          possible_seg_name.to_s
-        : Mx[:auto_seg_prefix] +
-          zero*zero_width +
+        ? possible_seg_name.to_s
+        : zero*zero_width +
           possible_seg_name.to_s
       end
     end
-    def auto_seg_name(possible_seg_name,heading_num_is)
+    def auto_seg_name(possible_seg_name,heading_num_is,type)
+      prefix=case type
+      when :auto then    Mx[:segname_prefix_auto_num_provide]
+      when :extract then Mx[:segname_prefix_auto_num_extract]
+      else               '_' #should not occur
+      end
       if possible_seg_name =~/^[0-9]+?\.$/m                                  #!~/[.,:-]+/
         possible_seg_name=possible_seg_name.
           gsub(/\.$/,'')
       end
       if possible_seg_name =~/^[0-9]+$/m \
       and possible_seg_name.to_i <= heading_num_is.to_i
-        leading_zeros_fixed_width_number(possible_seg_name)
+        prefix + leading_zeros_fixed_width_number(possible_seg_name)
       elsif possible_seg_name =~/^[\d.,:-]+$/m
         possible_seg_name=possible_seg_name.
           gsub(/(?:[:,-]|\W)/,'.').
           gsub(/\.$/,'')
-        #Mx[:auto_seg_prefix] + possible_seg_name
-      else possible_seg_name.to_s
+        prefix + possible_seg_name
+      else prefix + possible_seg_name.to_s
       end
     end
     def name_para_seg_filename(data)                                                   #segment naming, remaining
@@ -369,7 +372,7 @@ module SiSU_AO_Numbering
           and dob.obj =~/^\s*(?:\S+\s+)?([\d.,:-]+)/m      #heading starts with a recognised numeric or word followed by a recognised numeric construct, use that as name
             possible_seg_name=$1
             possible_seg_name=
-              auto_seg_name(possible_seg_name,heading_num_is)
+              auto_seg_name(possible_seg_name,heading_num_is,:extract)
             possible_seg_name=possible_seg_name.
               gsub(/(?:[:,-]|\W)/,'.').
               gsub(/\.$/,'')
@@ -394,7 +397,7 @@ module SiSU_AO_Numbering
           if dob.ln==4 \
           and not dob.name                                 #if still no segment name, provide a numerical one
             possible_seg_name=
-              auto_seg_name(art_filename_auto,heading_num_is)
+              auto_seg_name(art_filename_auto,heading_num_is,:auto)
             if @md.seg_names.is_a?(Array) \
             and not @md.seg_names.include?(possible_seg_name)
              dob.name=possible_seg_name
diff --git a/lib/sisu/v6/constants.rb b/lib/sisu/v6/constants.rb
index d25478d1..53ed226a 100644
--- a/lib/sisu/v6/constants.rb
+++ b/lib/sisu/v6/constants.rb
@@ -104,7 +104,8 @@ Xx={
   html_relative1:            '※',
 }
 Mx={
-  auto_seg_prefix:           's',
+  segname_prefix_auto_num_extract: 's',
+  segname_prefix_auto_num_provide: 's_',
   ocn_id_char:               'o',
   note:                      'note_',
   note_ref:                  'noteref_',
diff --git a/rbuild b/rbuild
index 9ca47c2a..46ac3a1a 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.4.4'
-SiSU_version_next_unstable   = '6.0.10'
+SiSU_version_next_stable     = '5.4.5'
+SiSU_version_next_unstable   = '6.0.11'
 #% rake file
 SiSU_version_generic_next_stable     = '5.4.x'
 SiSU_version_generic_next_unstable   = '6.0.x'
@@ -316,8 +316,8 @@ proceed? }
     def self.changelog_header(vi)
       <<-WOK
 %% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')})
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_#{vi[:version]}
-http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_#{vi[:version]}-1
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]}
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz
   sisu_#{vi[:version]}.orig.tar.xz
   sisu_#{vi[:version]}-1.dsc