diff options
| author | Ralph Amissah <ralph@amissah.com> | 2008-07-03 23:04:29 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2008-07-03 23:04:29 -0400 |
| commit | 21e70b5aa5439d0a27eb445b0743a39078cbbc7d (patch) | |
| tree | 2f4c551a1e8e27072d1f548998b2a95ada69a2c7 | |
| parent | Updated sisu-0.67.2 (diff) | |
| parent | changelog and version updated (diff) | |
Merge branch 'upstream' into debian/sid
| -rw-r--r-- | CHANGELOG | 16 | ||||
| -rw-r--r-- | conf/sisu/version.yml | 6 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG | 16 | ||||
| -rw-r--r-- | lib/sisu/v0/help.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 9 |
5 files changed, 34 insertions, 15 deletions
@@ -9,11 +9,21 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.67.3.orig.tar.gz (2008-07-02:27/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.3.orig.tar.gz + sisu_0.67.3.orig.tar.gz + sisu_0.67.3-1.dsc + sisu_0.67.3-1.diff.gz + + * help environment fix "sisu --help env" + + * texpdf (sysenv), papersize re-fixed (xetex landscape pdf fix fixed) + %% sisu_0.67.2.orig.tar.gz (2008-07-02:26/3) http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.2.orig.tar.gz - sisu_0.67.2.orig.tar.gz - sisu_0.67.2-1.dsc - sisu_0.67.2-1.diff.gz + 36a97294563c59827bc88b9187dd824ee5c66b62cbf59d4a53e806a6a0e9f8e1 1500273 sisu_0.67.2.orig.tar.gz + d83ac907c803de304503afb0cb877bd514228010e47155c652aac8be1aa18e8f 1159 sisu_0.67.2-1.dsc + ba7838ca7406157bdf430ad31b21665b20e89184d86b1b7cf5e33322a87e5396 146591 sisu_0.67.2-1.diff.gz * texpdf (sysenv), fix required for xetex landscape pdfs diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml index ee401b42..b9be57ee 100644 --- a/conf/sisu/version.yml +++ b/conf/sisu/version.yml @@ -1,5 +1,5 @@ --- -:version: 0.67.2 -:date_stamp: 2008w26/3 -:date: "2008-07-02" +:version: 0.67.3 +:date_stamp: 2008w26/4 +:date: "2008-07-03" :project: SiSU diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG index 34b611b9..46c0c734 100644 --- a/data/doc/sisu/CHANGELOG +++ b/data/doc/sisu/CHANGELOG @@ -9,11 +9,21 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.67.3.orig.tar.gz (2008-07-02:27/4) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.3.orig.tar.gz + sisu_0.67.3.orig.tar.gz + sisu_0.67.3-1.dsc + sisu_0.67.3-1.diff.gz + + * help environment fix "sisu --help env" + + * texpdf (sysenv), papersize re-fixed (xetex landscape pdf fix fixed) + %% sisu_0.67.2.orig.tar.gz (2008-07-02:26/3) http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.2.orig.tar.gz - sisu_0.67.2.orig.tar.gz - sisu_0.67.2-1.dsc - sisu_0.67.2-1.diff.gz + 36a97294563c59827bc88b9187dd824ee5c66b62cbf59d4a53e806a6a0e9f8e1 1500273 sisu_0.67.2.orig.tar.gz + d83ac907c803de304503afb0cb877bd514228010e47155c652aac8be1aa18e8f 1159 sisu_0.67.2-1.dsc + ba7838ca7406157bdf430ad31b21665b20e89184d86b1b7cf5e33322a87e5396 146591 sisu_0.67.2-1.diff.gz * texpdf (sysenv), fix required for xetex landscape pdfs diff --git a/lib/sisu/v0/help.rb b/lib/sisu/v0/help.rb index f470e0eb..acbae57b 100644 --- a/lib/sisu/v0/help.rb +++ b/lib/sisu/v0/help.rb @@ -1078,7 +1078,7 @@ WOK sqlite db for present directory: #{@cX.blue}sqlite #{@env.path.output}/sisu_sqlite.db#{@cX.off} postgresql port set to: #{@cX.blue}#{@db.psql.port}#{@cX.off} postgresql db for present directory: #{@cX.blue}#{@db.psql.db}#{@cX.off} - [first create manually if necessary: 'createdb #{@db.psql.name}'] + [first create manually if necessary: 'createdb #{@db.psql.db}'] [generated sqlite cgi search form]: #{@cX.blue}#{@env.url.webserv_base_cgi}/cgi-bin/sisu_sqlite.cgi#{@cX.off} [generated postgresql cgi search form]: #{@cX.blue}#{@env.url.webserv_base_cgi}/cgi-bin/sisu_pgsql.cgi#{@cX.off} diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index 3f23b7e5..31f4f19f 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -668,11 +668,10 @@ module SiSU_Env def latex2pdf(md=nil) #convert from latex to pdf tell=((@cmd =~/[MVv]/) ? '' : '> /dev/null' ) papersize='a4' - if md and defined? @md.papersize and md.papersize.empty? - papersize=if @md.papersize =~/(?:a4|letter|legal|book|a5|b5)\b/ - md.papersize - else papersize - end + papersize=if md and defined? md.papersize and not md.papersize.empty? \ + and md.papersize =~/(?:a4|letter|legal|book|a5|b5)\b/ + md.papersize + else papersize end mode='batchmode' #mode='nonstopmode' |