diff options
| author | Ralph Amissah <ralph@amissah.com> | 2008-07-12 14:49:01 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2008-07-12 14:49:01 -0400 |
| commit | fac785a480a80903ef03307e7c320359ec067335 (patch) | |
| tree | df20b832ab58dc52b34f23289bb34f2232d682da | |
| parent | Updated sisu-0.67.4 (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 | 2 | ||||
| -rw-r--r-- | data/doc/sisu/CHANGELOG | 16 | ||||
| -rw-r--r-- | lib/sisu/v0/sysenv.rb | 6 | ||||
| -rw-r--r-- | lib/sisu/v0/texpdf_format.rb | 2 |
5 files changed, 31 insertions, 11 deletions
@@ -9,11 +9,21 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.67.5.orig.tar.gz (2008-07-12:27/6) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.5.orig.tar.gz + sisu_0.67.5.orig.tar.gz + sisu_0.67.5-1.dsc + sisu_0.67.5-1.diff.gz + + * texpdf xetex and xelatex processing commands, fix + + * texpdf A5 size landscape pdf, tex document header, fix + %% sisu_0.67.4.orig.tar.gz (2008-07-12:27/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.4.orig.tar.gz - sisu_0.67.4.orig.tar.gz - sisu_0.67.4-1.dsc - sisu_0.67.4-1.diff.gz + ec905056760f7be8db639d053be4ada9118bfb2c66832206ab92eccf6d8239a7 1500229 sisu_0.67.4.orig.tar.gz + df5e57639213a641075500f57a57eb1ecdb2453afef3a2c0c71093ccdee6c91a 1159 sisu_0.67.4-1.dsc + 7fe5a938eb2faa721ec70aea3c3a0b3af66546dcbf55deef16044b862c40b354 146675 sisu_0.67.4-1.diff.gz * remote sisu sourcefile and sisupod, fixes, download and generate locally diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml index be7fa7f6..fb6a31b5 100644 --- a/conf/sisu/version.yml +++ b/conf/sisu/version.yml @@ -1,5 +1,5 @@ --- -:version: 0.67.4 +:version: 0.67.5 :date_stamp: 2008w27/6 :date: "2008-07-12" :project: SiSU diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG index 4cdba0bb..a99561a2 100644 --- a/data/doc/sisu/CHANGELOG +++ b/data/doc/sisu/CHANGELOG @@ -9,11 +9,21 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu_0.67.5.orig.tar.gz (2008-07-12:27/6) +http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.5.orig.tar.gz + sisu_0.67.5.orig.tar.gz + sisu_0.67.5-1.dsc + sisu_0.67.5-1.diff.gz + + * texpdf xetex and xelatex processing commands, fix + + * texpdf A5 size landscape pdf, tex document header, fix + %% sisu_0.67.4.orig.tar.gz (2008-07-12:27/6) http://www.jus.uio.no/sisu/pkg/src/sisu_0.67.4.orig.tar.gz - sisu_0.67.4.orig.tar.gz - sisu_0.67.4-1.dsc - sisu_0.67.4-1.diff.gz + ec905056760f7be8db639d053be4ada9118bfb2c66832206ab92eccf6d8239a7 1500229 sisu_0.67.4.orig.tar.gz + df5e57639213a641075500f57a57eb1ecdb2453afef3a2c0c71093ccdee6c91a 1159 sisu_0.67.4-1.dsc + 7fe5a938eb2faa721ec70aea3c3a0b3af66546dcbf55deef16044b862c40b354 146675 sisu_0.67.4-1.diff.gz * remote sisu sourcefile and sisupod, fixes, download and generate locally diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb index bde769e2..3d01729e 100644 --- a/lib/sisu/v0/sysenv.rb +++ b/lib/sisu/v0/sysenv.rb @@ -683,15 +683,15 @@ module SiSU_Env if @input =~/landscape\.tex$/ %{#{texpdf} -interaction=#{mode} -fmt=xelatex -papersize="#{papersize} -l" #@input #{tell}\n} else - "#{texpdf} -interaction=#{mode} -fmt=xelatex #@input #{tell}\n" + %{#{texpdf} -interaction=#{mode} -fmt=xelatex -papersize="#{papersize}" #@input #{tell}\n} end when /xelatex/ if @input =~/landscape\.tex$/ %{#{texpdf} -interaction=#{mode} -papersize="#{papersize} -l" #@input #{tell}\n} else - "#{texpdf} -interaction=#{mode} #@input #{tell}\n" + %{#{texpdf} -interaction=#{mode} -papersize="#{papersize}" #@input #{tell}\n} end - when /pdftex/; "#{texpdf} -interaction=#{mode} -fmt=pdflatex #@input #{tell}\n" + when /pdftex/; "#{texpdf} -interaction=#{mode} -fmt=pdflatex #@input #{tell}\n" when /pdflatex/; "#{texpdf} -interaction=#{mode} #@input #{tell}\n" end system(texpdf_cmd) diff --git a/lib/sisu/v0/texpdf_format.rb b/lib/sisu/v0/texpdf_format.rb index 75a3ff91..ee457ca3 100644 --- a/lib/sisu/v0/texpdf_format.rb +++ b/lib/sisu/v0/texpdf_format.rb @@ -1241,7 +1241,7 @@ WOK d[:textheight],d[:textwidth]=@tx.b5.landscape.h,@tx.b5.landscape.w when /a5/i d[:papertype],d[:fontsize],d[:columnsep]='a5paper','10pt','38pt' - d[:textheight],d[:textwidth]='10pt',@tx.a5.landscape.h,@tx.a5.landscape.w + d[:textheight],d[:textwidth]=@tx.a5.landscape.h,@tx.a5.landscape.w else #default currently A4 d[:papertype],d[:fontsize]='a4paper','12pt' d[:textheight],d[:textwidth]=@tx.a4.landscape.h,@tx.a4.landscape.w |