Merge branch 'upstream' into debian/sid

5 files changed, 46 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index efb5a3e0..34026118 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,21 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.71.2.orig.tar.gz (2009-08-02:30/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.2.orig.tar.gz
+  sisu_0.71.2.orig.tar.gz
+  sisu_0.71.2-1.dsc
+  sisu_0.71.2-1.diff.gz
+
+  * fixes
+    * html book index, batch processing fix, re-initialize variable after use
+    * sysenv, sha256 use fix, need to set variable with pwd
+
 %% sisu_0.71.1.orig.tar.gz (2009-07-24:29/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz
-  sisu_0.71.1.orig.tar.gz
-  sisu_0.71.1-1.dsc
-  sisu_0.71.1-1.diff.gz
+  2027a8b6690a6e82cb6c6bc5b594fd6214d215ee09989e0c58a8f5abfbd306fd 1549323 sisu_0.71.1.orig.tar.gz
+  044d623f1d158bbe43e0755eeebc11496000edfab1ddca49128ca1ff1ee2da45 1151 sisu_0.71.1-1.dsc
+  628af933efd0fdda7694c9f0e31c79dc9e5f9282648a8dd75c5d91a8482c8dac 151315 sisu_0.71.1-1.diff.gz
 
   * dal images, if no rmagick, system call imagemagick directly if available
 
diff --git a/conf/sisu/version1.yml b/conf/sisu/version1.yml
index 9cc20a57..63106385 100644
--- a/conf/sisu/version1.yml
+++ b/conf/sisu/version1.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 0.71.1
-:date_stamp: 2009w29/5
-:date: "2009-07-24"
+:version: 0.71.2
+:date_stamp: 2009w30/7
+:date: "2009-08-02"
 :project: SiSU
diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 170a9299..34026118 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -9,11 +9,35 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
-%% sisu_0.71.0.orig.tar.gz (2009-07-09(:27/4)
+%% sisu_0.71.2.orig.tar.gz (2009-08-02:30/7)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.2.orig.tar.gz
+  sisu_0.71.2.orig.tar.gz
+  sisu_0.71.2-1.dsc
+  sisu_0.71.2-1.diff.gz
+
+  * fixes
+    * html book index, batch processing fix, re-initialize variable after use
+    * sysenv, sha256 use fix, need to set variable with pwd
+
+%% sisu_0.71.1.orig.tar.gz (2009-07-24:29/5)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.1.orig.tar.gz
+  2027a8b6690a6e82cb6c6bc5b594fd6214d215ee09989e0c58a8f5abfbd306fd 1549323 sisu_0.71.1.orig.tar.gz
+  044d623f1d158bbe43e0755eeebc11496000edfab1ddca49128ca1ff1ee2da45 1151 sisu_0.71.1-1.dsc
+  628af933efd0fdda7694c9f0e31c79dc9e5f9282648a8dd75c5d91a8482c8dac 151315 sisu_0.71.1-1.diff.gz
+
+  * dal images, if no rmagick, system call imagemagick directly if available
+
+  * manifest, include book index if available
+
+  * html scroll css, left margin
+
+  * html seg, navigation band buttons placement
+
+%% sisu_0.71.0.orig.tar.gz (2009-07-09:27/4)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.71.0.orig.tar.gz
-  sisu_0.71.0.orig.tar.gz
-  sisu_0.71.0-1.dsc
-  sisu_0.71.0-1.diff.gz
+  5fa480544ae30d2e2e21064cb505e3c72a467a4ca8018fd1c51ec485ff5b668e 1548373 sisu_0.71.0.orig.tar.gz
+  25f9c4109b361153f325b97e6e48baae702cd889aa7535c2efa3070867117243 1151 sisu_0.71.0-1.dsc
+  7f718b681da6aa18c826586337f793c9d05e5c9e6d39b0856420d021096594d5 151143 sisu_0.71.0-1.diff.gz
 
   * prepare for version 1, (and make way for version 2) 
     * move lib to v1 from v0 lib/sisu/v1
diff --git a/lib/sisu/v1/html_segments.rb b/lib/sisu/v1/html_segments.rb
index d874063a..66e04800 100644
--- a/lib/sisu/v1/html_segments.rb
+++ b/lib/sisu/v1/html_segments.rb
@@ -201,6 +201,7 @@ module SiSU_HTML_seg
                   Seg_output.new(@md,@output_seg_file,@@seg,@minitoc,'endnotes').output
                 elsif @@seg_name_html[tracking-1] =~/idx/
                   Seg_output.new(@md,@output_seg_file,@@seg,@minitoc,'idx').output
+                  @@seg[:idx]=[]
                 else p 'check'
                 end
                 Seg.new.reinitialise
diff --git a/lib/sisu/v1/sysenv.rb b/lib/sisu/v1/sysenv.rb
index c3c2a0ee..8d4636c1 100644
--- a/lib/sisu/v1/sysenv.rb
+++ b/lib/sisu/v1/sysenv.rb
@@ -612,6 +612,7 @@ module SiSU_Env
       program='openssl'
       program_ref="\n\t\tsha digest requested"
       if program_found?(program)
+        pwd=Dir.pwd
         Dir.chdir(File.dirname(filename))
         dgst=%x{openssl dgst -sha256 #{File.basename(filename)}}.strip #use file name without file path
         Dir.chdir(pwd)