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