Merge branch 'upstream' into debian/sid

3 files changed, 14 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 663cb8fd..15cea60f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,19 @@ Reverse Chronological:
 
 %% STABLE MANIFEST
 
+%% sisu_0.69.1.orig.tar.gz (2008-09-17:37/3)
+http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.1.orig.tar.gz
+  sisu_0.69.1.orig.tar.gz
+  sisu_0.69.1-1.dsc
+  sisu_0.69.1-1.diff.gz
+
+  * dal fix, dal_substitutions_and_insertions get skin info
+
 %% sisu_0.69.0.orig.tar.gz (2008-09-16:37/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
-  sisu_0.69.0.orig.tar.gz
-  sisu_0.69.0-1.dsc
-  sisu_0.69.0-1.diff.gz
+  87f10686f20d02ba969a186db4333f25b4c063f13fc2d7824e6a8db7da41a4f1 1519352 sisu_0.69.0.orig.tar.gz
+  082a19e5676940723bc033de75f11e1592aefdbe2b698b24e274f01c3586d08c 1159 sisu_0.69.0-1.dsc
+  477af2b3d2a7e9b6aa7f5fa8952d5e8d90cf607a235483bf7482834af9d7610a 146757 sisu_0.69.0-1.diff.gz
 
   * html
      * increased use of css, necessary to re-initialise sisu output directory
@@ -52,6 +60,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_0.69.0.orig.tar.gz
 
   * dal, several modules split into separate files
 
+  * vim syntax file updated to include syntax for book index
+
 %% sisu_0.68.0.orig.tar.gz (2008-07-22:29/2)
 http://www.jus.uio.no/sisu/pkg/src/sisu_0.68.0.orig.tar.gz
   cecae8b828aa187b22354f2ee9e8a8b5244dd9f4 1509605 sisu_0.68.0.orig.tar.gz
diff --git a/lib/sisu/v0/dal.rb b/lib/sisu/v0/dal.rb
index 18e2f8dd..094cf53c 100644
--- a/lib/sisu/v0/dal.rb
+++ b/lib/sisu/v0/dal.rb
@@ -221,7 +221,6 @@ module SiSU_DAL
     def initialize(md,data)
       @md,@data=md,data
       @env=SiSU_Env::Info_env.new(@md.fns)
-      @skin=SiSU_Env::Info_skin.new(@md)
       @dp=@@dp ||=SiSU_Env::Info_env.new.digest.pattern
     end
     def reset
diff --git a/lib/sisu/v0/dal_substitutions_and_insertions.rb b/lib/sisu/v0/dal_substitutions_and_insertions.rb
index dad07ec9..74a06138 100644
--- a/lib/sisu/v0/dal_substitutions_and_insertions.rb
+++ b/lib/sisu/v0/dal_substitutions_and_insertions.rb
@@ -63,6 +63,7 @@ module SiSU_substitute_and_insert
   class SI
     def initialize(md,data)
       @md,@data=md,data
+      @skin=SiSU_Env::Info_skin.new(@md)
     end
     def substitutions_and_insertions?
       data=@data