Merge branch 'upstream' into debian/sid

6 files changed, 46 insertions, 20 deletions

diff --git a/CHANGELOG_v2 b/CHANGELOG_v2
index c7962297..bf31edb0 100644
--- a/CHANGELOG_v2
+++ b/CHANGELOG_v2
@@ -12,11 +12,20 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.5.1.orig.tar.gz (2010-06-12:23/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
+  sisu_2.5.1.orig.tar.gz
+  sisu_2.5.1-1.dsc
+  sisu_2.5.1-1.diff.gz
+
+  * texpdf, ensure programs default font is set (Liberation Sans) if none
+    configured, (was intended, required fix)
+
 %% 2.5.0.orig.tar.gz (2010-06-11:23/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
-  sisu_2.5.0.orig.tar.gz
-  sisu_2.5.0-1.dsc
-  sisu_2.5.0-1.diff.gz
+  8a5331b6128e9bdd99704aa9b9e37666d399b2801655db00a665abf1ec0d7a37 2767480 sisu_2.5.0.orig.tar.gz
+  6c4c9a1737e6bd22b4d0a2a30419280f5bde67bc272bf9f2f2b8e59dc15d6c65 1145 sisu_2.5.0-1.dsc
+  1c0f4253e1b16a6afb7cdaafe61bd8b67b18f28f25277ef4f1224c9836843ddc 276348 sisu_2.5.0-1.diff.gz
 
   * texpdf, font selection permitted in sisurc.yml (default: texpdf_font:) or
     document header (@make: :texpdf_font:)
diff --git a/conf/sisu/v2/version.yml b/conf/sisu/v2/version.yml
index 0b5ed396..167d5fde 100644
--- a/conf/sisu/v2/version.yml
+++ b/conf/sisu/v2/version.yml
@@ -1,5 +1,5 @@
 --- 
-:version: 2.5.0
-:date_stamp: 2010w23/5
-:date: "2010-06-11"
+:version: 2.5.1
+:date_stamp: 2010w23/6
+:date: "2010-06-12"
 :project: SiSU
diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG
index 489572c4..d6556c0c 100644
--- a/data/doc/sisu/v2/CHANGELOG
+++ b/data/doc/sisu/v2/CHANGELOG
@@ -12,11 +12,20 @@ Reverse Chronological:
 
 %% Development branch UNSTABLE
 
+%% 2.5.1.orig.tar.gz (2010-06-12:23/6)
+http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
+  sisu_2.5.1.orig.tar.gz
+  sisu_2.5.1-1.dsc
+  sisu_2.5.1-1.diff.gz
+
+  * texpdf, ensure programs default font is set (Liberation Sans) if none
+    configured, (was intended, required fix)
+
 %% 2.5.0.orig.tar.gz (2010-06-11:23/5)
 http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
-  sisu_2.5.0.orig.tar.gz
-  sisu_2.5.0-1.dsc
-  sisu_2.5.0-1.diff.gz
+  8a5331b6128e9bdd99704aa9b9e37666d399b2801655db00a665abf1ec0d7a37 2767480 sisu_2.5.0.orig.tar.gz
+  6c4c9a1737e6bd22b4d0a2a30419280f5bde67bc272bf9f2f2b8e59dc15d6c65 1145 sisu_2.5.0-1.dsc
+  1c0f4253e1b16a6afb7cdaafe61bd8b67b18f28f25277ef4f1224c9836843ddc 276348 sisu_2.5.0-1.diff.gz
 
   * texpdf, font selection permitted in sisurc.yml (default: texpdf_font:) or
     document header (@make: :texpdf_font:)
diff --git a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
index c2186adc..b71ddbca 100644
--- a/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
+++ b/data/doc/sisu/v2/sisu_markup_samples/sisu_manual/sisu_download.ssi
@@ -55,7 +55,7 @@
 
 3~source- Source (tarball tar.gz)
 
-_* {~^ sisu_2.5.0.orig.tar.gz (2010-06-11:23/5) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
+_* {~^ sisu_2.5.1.orig.tar.gz (2010-06-12:23/6) }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
 
 _* {~^ sisu-markup-samples_2.0.3.orig.tar.gz (of 2010-05-01:17/6 ) }http://www.jus.uio.no/sisu/pkg/src/sisu-markup-samples_2.0.3.orig.tar.gz *~sisu-markup-samples
 
@@ -102,11 +102,11 @@ group{
 
 *{Source}*
 
-{~^ sisu_2.5.0.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0.orig.tar.gz
+{~^ sisu_2.5.1.orig.tar.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1.orig.tar.gz
 
-{~^ sisu_2.5.0-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0-1.diff.gz
+{~^ sisu_2.5.1-1.diff.gz }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1-1.diff.gz
 
-{~^ sisu_2.5.0-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.0-1.dsc
+{~^ sisu_2.5.1-1.dsc }http://www.jus.uio.no/sisu/pkg/src/sisu_2.5.1-1.dsc
 
 }group
 
@@ -114,15 +114,15 @@ group{
 
 *{Debs}*
 
-{~^ sisu_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.5.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_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu_2.5.1-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_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.5.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_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-complete_2.5.1-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_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.5.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_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-pdf_2.5.1-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_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.5.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_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-postgresql_2.5.1-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_2.5.0-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.5.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_2.5.1-1_all.deb }http://www.jus.uio.no/sisu/archive/pool/main/s/sisu/sisu-sqlite_2.5.1-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 }~
 
 }group
 
@@ -152,7 +152,7 @@ The RPM is generated from the source file using Alien.~{ http://www.kitenet.net/
 
 sudo rpm -i [package name]
 
-_* {~^ sisu-2.5.0-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.5.0-2.noarch.rpm ~{ <br>created using alien }~
+_* {~^ sisu-2.5.1-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-2.5.1-2.noarch.rpm ~{ <br>created using alien }~
 
 _* {~^ sisu-markup-samples_2.0.3.orig-2.noarch.rpm }http://www.jus.uio.no/sisu/pkg/rpm/sisu-markup-samples_2.0.3.orig-2.noarch.rpm ~{ <br> http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.3-1_all.deb <br> created using: alien -r sisu_0.70.5-1_all.deb }~
 
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index 8a9e38be..26e842ec 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -1268,6 +1268,7 @@ WOK
     def font
       def texpdf
         (defined? @rc['default']['texpdf_font']) \
+        && (@rc['default']['texpdf_font']=~/\S{3,}/)  \
         ? @rc['default']['texpdf_font'] \
         : 'Liberation Sans' #'Liberation Sans' #'Liberation Serif'
       end
diff --git a/lib/sisu/v2/texpdf_format.rb b/lib/sisu/v2/texpdf_format.rb
index e756aa03..ba615749 100644
--- a/lib/sisu/v2/texpdf_format.rb
+++ b/lib/sisu/v2/texpdf_format.rb
@@ -585,6 +585,7 @@ module SiSU_TeX_Pdf
   class Format_head
     def initialize(md,t_o)
       @md,@t_o=md,t_o
+      @env=SiSU_Env::Info_env.new(@md.fns)
       if t_o.class==Hash
         @txt =t_o[:txt]            || nil
         @subtitle=t_o[:subtitle]   || nil
@@ -642,13 +643,19 @@ module SiSU_TeX_Pdf
       end
     end
     def tex_head_encode
+      texpdf_font=if defined? @md.make.texpdf_font \
+      and not @md.make.texpdf_font.nil? \
+      and @md.make.texpdf_font=~/\S{3,}/
+        @md.make.texpdf_font
+      else @env.font.texpdf
+      end
       case @tex2pdf
       when /xe/
         <<WOK
 \\usepackage{polyglossia, ucs, fontspec, xltxtra, xunicode}
 \\setmainlanguage{#{tex_head_lang}}
 \\setotherlanguage{english}
-\\setmainfont{#{@md.make.texpdf_font}}
+\\setmainfont{#{texpdf_font}}
 WOK
       when /pdf/
         if @md.file_encoding =~ /iso-?8859/i                                   #% iso8859