From d29a3e5469d8468084641c385ebf16948f7c2437 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 22 Jul 2008 20:00:59 -0400
Subject: sisu-0.68.0 proposed * middle layer document representation changed,
 (accounting for substantial patch) * texpdf multiple document sizes as
 specified in config * numerous small fixes [should on the whole be easier to
 maintain]

---
 lib/sisu/v0/sysenv.rb | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

(limited to 'lib/sisu/v0/sysenv.rb')

diff --git a/lib/sisu/v0/sysenv.rb b/lib/sisu/v0/sysenv.rb
index 3d01729e..a259d991 100644
--- a/lib/sisu/v0/sysenv.rb
+++ b/lib/sisu/v0/sysenv.rb
@@ -380,7 +380,8 @@ module SiSU_Env
           @@flv ||=document_language_versions_found[:f]
           unless @@fns =~/\S+?\.zip/
             @@fnz ||=if @@fns =~/(?:\~\S{2,3})?\.(?:ssm\.sst|ssm)$/; @@fnb + '.ssm.zip'
-            else @@fnb + '.sst.zip'
+            elsif @fnb; @@fnb + '.sst.zip'
+            else '' # e.g. termsheet
             end
           end
         else m=/(.+?)\.((?:-|ssm\.)?sst|ssm)$/
@@ -491,6 +492,16 @@ module SiSU_Env
         :xhtml           => filename(code,'scroll','.xhtml'),
         :pdf_l           => filename(code,'landscape','.pdf'),
         :pdf_p           => filename(code,'portrait','.pdf'),
+        :pdf_l_a4        => filename(code,'landscape.a4','.pdf'),
+        :pdf_p_a4        => filename(code,'portrait.a4','.pdf'),
+        :pdf_l_a5        => filename(code,'landscape.a5','.pdf'),
+        :pdf_p_a5        => filename(code,'portrait.a5','.pdf'),
+        :pdf_l_b5        => filename(code,'landscape.b5','.pdf'),
+        :pdf_p_b5        => filename(code,'portrait.b5','.pdf'),
+        :pdf_l_letter    => filename(code,'landscape.letter','.pdf'),
+        :pdf_p_letter    => filename(code,'portrait.letter','.pdf'),
+        :pdf_l_legal     => filename(code,'landscape.legal','.pdf'),
+        :pdf_p_legal     => filename(code,'portrait.legal','.pdf'),
         :toc             => filename(code,'toc','.html'),
         :doc             => filename(code,'doc','.html'),
         :index           => filename(code,'index','.html'),
@@ -665,14 +676,8 @@ module SiSU_Env
       end
       @texpdf
     end
-    def latex2pdf(md=nil)                                                              #convert from latex to pdf
+    def latex2pdf(md,papersize='a4')                                                              #convert from latex to pdf
       tell=((@cmd =~/[MVv]/) ? '' : '> /dev/null' )
-      papersize='a4'
-      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'
       program_ref="\n\t\tSee http://www.tug.org/applications/pdftex/\n\t\tOn Debian this is is included in tetex-extra"
@@ -2045,8 +2050,8 @@ WOK
       is
     end
     def papersize                                                              # paper settings, default overidden in param if set within document
-      if defined? @rc['default']['papersize'];   @rc['default']['papersize'].downcase
-      else                                       defaults[:papersize].downcase
+      if defined? @rc['default']['papersize']; @rc['default']['papersize'].downcase
+      else                                     defaults[:papersize].downcase
       end
     end
     def odf_structure
@@ -3130,6 +3135,11 @@ WOK
       dest="#{@env.path.webserv}/_sisu/image"
       cp_images(src,dest)
     end
+    def cp_webserver_images_local #this should not have been necessary
+      src=@env.path.image_source
+      dest="#{@env.path.webserv}/#{@env.path.stub_pwd}/_sisu/image"
+      cp_images(src,dest)
+    end
     def cp_base_images #fix images
       src="#{@env.path.share}/image"
       dest="#{@env.path.webserv}/_sisu/image_sys"
-- 
cgit v1.2.3