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 /lib | |
| parent | Updated sisu-0.67.2 (diff) | |
| parent | changelog and version updated (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sisu/v0/help.rb | 2 | ||||
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 9 |
2 files changed, 5 insertions, 6 deletions
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' |