Merge branch 'upstream' into debian/sid

5 files changed, 22 insertions, 16 deletions

diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
index 977a1b29..bac6d558 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version.yml
@@ -1,5 +1,5 @@
 --- 
-:date: "2007-11-03"
+:date: "2007-11-26"
 :project: SiSU
-:version: 0.62.2
-:date_stamp: 2007w44/6
+:version: 0.62.3-pre
+:date_stamp: 2007w48/1
diff --git a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
index e40b0306..65240f7f 100644
--- a/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -55,7 +55,7 @@
 
 Download the latest version of SiSU (and SiSU markup samples):~{ Breakage and Fixes Report<br> http://www.jus.uio.no/sisu/SiSU/breakage_and_fixes.html }~
 
-_* {~^ sisu_0.62.0.orig.tar.gz (of 2007-10-19:42/5) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
+_* {~^ sisu_0.62.3.orig.tar.gz (of 2007-11-26:48/1) }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
 
 _* {~^ sisu-markup-samples_1.0.8.orig.tar.gz (of 2007-08-19:33/7 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_1.0.8.orig.tar.gz *~sisu-markup-samples
 
@@ -90,23 +90,23 @@ deb-src http://www.jus.uio.no/sisu/archive unstable main non-free
 
 !_ Source
 
-_* {~^ sisu_0.62.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0.orig.tar.gz
+_* {~^ sisu_0.62.3.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
 
-_* {~^ sisu_0.62.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0-1.diff.gz
+_* {~^ sisu_0.62.3-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3-1.diff.gz
 
-_* {~^ sisu_0.62.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.0-1.dsc
+_* {~^ sisu_0.62.3-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3-1.dsc
 
 !_ Debs
 
-_* {~^ sisu_0.62.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.62.0-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
+_* {~^ sisu_0.62.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_0.62.3-1_all.deb ~{ <br>sisu, the base code, (the main package on which the others depend), without any dependencies other than ruby (and for convenience the ruby webrick web server), this generates a number of types of output on its own, other packages provide additional functionality, and have their dependencies <br>Depends: ruby (>=1.8.2), libwebrick-ruby<br>Recommends: sisu-pdf, sisu-sqlite, sisu-postgresql, sisu-examples, vim-sisu, librmagick-ruby, trang, tidy, libtidy, librexml-ruby, zip, unzip, openssl }~
 
-_* {~^ sisu-complete_0.62.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.62.0-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
+_* {~^ sisu-complete_0.62.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_0.62.3-1_all.deb ~{ <br>a package that pulls in other packages to build the whole of sisu (excluding sisu-examples) <br>Depends: ruby (>=1.8.2), sisu, sisu-pdf, sisu-postgresql, sisu-remote, sisu-sqlite, vim-sisu<br>Recommends: sisu-examples }~
 
-_* {~^ sisu-pdf_0.62.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.62.0-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
+_* {~^ sisu-pdf_0.62.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_0.62.3-1_all.deb ~{ <br>dependencies used by sisu to produce pdf from LaTeX generated <br>Depends: sisu, tetex-bin, tetex-extra, latex-ucs<br>Suggests: evince, xpdf }~
 
-_* {~^ sisu-postgresql_0.62.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.62.0-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
+_* {~^ sisu-postgresql_0.62.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_0.62.3-1_all.deb ~{ <br>dependencies used by sisu to populate postgresql database (further configuration is necessary) <br>Depends: sisu, postgresql-8.1, libdbi-ruby, libdbm-ruby, libdbd-pg-ruby<br>Suggests: pgaccess, libdbd-pgsql, postgresql-contrib-8.1 }~
 
-_* {~^ sisu-sqlite_0.62.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.62.0-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
+_* {~^ sisu-sqlite_0.62.3-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_0.62.3-1_all.deb ~{ <br>dependencies used by sisu to populate sqlite database <br>Depends: sisu, sqlite, libdbi-ruby, libdbm-ruby, libdbd-sqlite-ruby<br>Suggests: libdbd-sqlite }~
 
 For changelogs see:
 
@@ -132,7 +132,7 @@ _1 http://www.jus.uio.no/sisu/sisu_markup_samples_changelog/changelog_markup_sam
 
 The RPM is generated Alien~{ http://www.kitenet.net/programs/alien/ }~ from two deb packages (sisu and sisu-doc). Dependencies are not handled, not even that of the essential Ruby.
 
-_* {~^ sisu-0.62.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.62.0-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.62.0-1_all.deb }~
+_* {~^ sisu-0.62.3-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-0.62.3-2.noarch.rpm ~{ untested, created using: alien -r sisu_0.62.3-1_all.deb }~
 
 _* {~^ sisu-markup-samples_1.0.8.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_1.0.6.orig-2.noarch.rpm ~{ <br> untested, created using alien }~
 
diff --git a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
index 548cc43c..7cd6fdcc 100644
--- a/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
+++ b/data/sisu/conf/editor-syntax-etc/vim/ftplugin/sisu.vim
@@ -27,8 +27,7 @@
 :set gdefault
 :set guioptions=agmr
 :set paste
-:set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%04v:%04l/%L\ %p%%]
-":set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%L:%04l,%04v\ %p%%]
+:set statusline=%f%m%r%h%w\ [type=%Y]\ [format=%{&ff}]\ [%v:%l/%L\ %p%%]
 :set laststatus=2       " status line always on
 "% textwrap
 :set whichwrap=<,>,h,l,[,]
diff --git a/lib/sisu/v0/html_scroll.rb b/lib/sisu/v0/html_scroll.rb
index 483b5222..e7a63951 100644
--- a/lib/sisu/v0/html_scroll.rb
+++ b/lib/sisu/v0/html_scroll.rb
@@ -80,6 +80,9 @@ module SiSU_HTML_scroll
       @rcdc=false
       @scr={ :body=>[],:metadata=>[],:owner_details=>[] }
       data.each do |para|
+        if para =~/^\d~endnotes\s+Endnotes/
+          para.gsub!(/Endnotes.+/,'')
+        end
         if para =~/^\d~meta\s+Document Information/
           para.gsub!(/(Document Information(?: \(metadata\))?)/,'\1<a name="docinfo"></a>')
         end
@@ -147,6 +150,9 @@ module SiSU_HTML_scroll
             format_seg=SiSU_HTML_Format_type::Format_seg.new(@md,one,two)
             para=format_seg.no_paranum
           end
+          if para =~/Document Information \(metadata\)/
+            para.gsub!(/(Document Information \(metadata\))/,'<hr><br>\1')
+          end
           if para =~/<a name="n\d+">/ \
           and para =~/^(?:\^~\d+\s|<!e[:_]\d+!>)/ # hmmm re-adjusted 200507, for alt endnote which should again be matched ^~ ... not in response to problem though
             para=''
diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 930068f1..569db464 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -2301,6 +2301,7 @@ p @zap
         end
         #remote="#{remote_conn[:name]}/#{@env.path.stub_pwd}/."
         local_src=@source_path_src
+        local_pod=@source_path_pod
         remote_src="#{remote_conn[:name]}/#{@env.path.stub_src}/."
         remote_pod="#{remote_conn[:name]}/#{@env.path.stub_pod}/."
         src_txt=@opt.fnc
@@ -2355,7 +2356,7 @@ p @zap
           System_call.new(local_gen,remote_gen,@opt.cmd).rsync('--delete-after')
           if FileTest.file?("#{local_src}/#{src_txt}")
             System_call.new("#{local_src}/#{src_txt}",remote_src,@opt.cmd).rsync
-            if not @md.ec[:image].empty?
+            if defined? @md.ec[:image] and not @md.ec[:image].empty?
               images="#{local_gen_image}/" + @md.ec[:image].join(" #{local_gen_image}/")
               System_call.new(images,remote_images,@opt.cmd).rsync
               images_external="#{local_gen_image_external}/" + @md.ec[:image].join(" #{local_gen_image_external}/")