diff options
| author | Ralph Amissah <ralph@amissah.com> | 2013-02-07 19:12:08 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2013-02-07 19:12:08 -0500 |
| commit | 074d6d70a7b115ad5517af93d7d651b315b79dfb (patch) | |
| tree | b4c80cd2f197c48cf80e3d67d0ee2181bebf1660 /lib/sisu/v4/urls.rb | |
| parent | debian/changelog (4.0.5-1) (diff) | |
| parent | v4: version & changelog, dates touched (diff) | |
Merge tag 'sisu_4.0.6' into debian/sid
Diffstat (limited to 'lib/sisu/v4/urls.rb')
| -rw-r--r-- | lib/sisu/v4/urls.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/sisu/v4/urls.rb b/lib/sisu/v4/urls.rb index 5e6bcc8a..e3671dcd 100644 --- a/lib/sisu/v4/urls.rb +++ b/lib/sisu/v4/urls.rb @@ -355,11 +355,17 @@ module SiSU_Urls end end if x=~/--pdf\b/ \ - and @opt.act[:pdf][:set]==:on + and (@opt.act[:pdf][:set]==:on \ + or @opt.act[:pdf_p][:set]==:on \ + or @opt.act[:pdf_l][:set]==:on) if x =~/portrait/ - show.pdf.portrait(x) + if @opt.act[:pdf_p][:set]==:on + show.pdf.portrait(x) + end else - show.pdf.landscape(x) + if @opt.act[:pdf_l][:set]==:on + show.pdf.landscape(x) + end end end if x=~/--sisupod\b/ \ |