* scm/paper.scm (internal-set-paper-size): define landscape to #f

if unset.

* scm/framework-ps.scm (convert-to-pdf): swap h and w in case of landscape.

* scm/backend-library.scm (postscript->pdf): use -dEPSCrop for PDF.

* scm/backend-library.scm (postscript->pdf): strip .eps too.

diff --git a/ChangeLog b/ChangeLog
index 56e88a65f41dd0e6772cbfe482dcbbe245a41875..fde27e5a72f4cb202bd49fd9e304a10141b2aea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-07-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scm/paper.scm (internal-set-paper-size): define landscape to #f
+       if unset.
+
+       * scm/framework-ps.scm (convert-to-pdf): swap h and w in case of landscape. 
+
        * stepmake/stepmake/texinfo-rules.make: strip DVI support.
 
        * scm/framework-eps.scm (dump-stencils-as-EPSes): generate

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 42cc2688da6b3a558f6e59e655cb9cc690be9937..de44c4054a2df94b4a86b44d364eb4c3cfafee5d 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -58,8 +58,7 @@
                                " -dEPSCrop "
                                (format "-dDEVICEWIDTHPOINTS=~,2f \
 -dDEVICEHEIGHTPOINTS=~,2f "
-                                       paper-width
-                                       paper-height)))
+                                       paper-width paper-height )))
 
         (cmd (format #f
                      "~a\

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index e39b245233bdb9b82d9a393fc72b7cba5f876067..9095c1a9b903be15d57e3180b2dbd824bfb05226 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -590,15 +590,20 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-        (paper-width (ly:output-def-lookup defs 'paper-width))
-        (paper-height (ly:output-def-lookup defs 'paper-height))
-        (output-scale (ly:output-def-lookup defs 'output-scale)))
+        (landscape (ly:output-def-lookup defs 'landscape))
+        (output-scale (ly:output-def-lookup defs 'output-scale))
+        (convert (lambda (x) (* x output-scale (/ (ly:bp 1)))))
+        
+        (paper-width (convert (ly:output-def-lookup defs 'paper-width)))
+        (paper-height (convert (ly:output-def-lookup defs 'paper-height)))
+
+        (w (if landscape paper-height paper-width))
+        (h (if landscape paper-width paper-height))
+        )
 
     (if (equal? (basename name ".ps") "-")
        (ly:warning (_ "can't convert <stdout> to ~S" "PDF"))
-       (postscript->pdf (* paper-width output-scale (/ (ly:bp 1)))
-                        (* paper-height output-scale (/ (ly:bp 1)))
-                        name))))
+       (postscript->pdf w h name))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))

diff --git a/scm/paper.scm b/scm/paper.scm
index 6d1c9ec64f10d13379123f005b24fa5869e6fe84..5cd99e70cdbda708e8809f464d54a18d40bace43 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -120,9 +120,8 @@
       (set-paper-dimensions module (car entry) (cdr entry))
 
       (module-define! module 'papersizename name)
-
-      (if landscape?
-         (module-define! module 'landscape #t)))
+      (module-define! module 'landscape 
+                     (if landscape? #t #f)))
      (else
       (ly:warning (_ "Unknown papersize: ~a" name))))))