* scm/framework-ps.scm (dump-stencil-as-EPS): naming pad-eps-boxes.

[lilypond.git] / scm / framework-ps.scm

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index e39b245233bdb9b82d9a393fc72b7cba5f876067..60e241ac16d0770cb275ffdc3991de09bdadb33a 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -409,7 +409,7 @@
                   (lambda (x y) (string<? (cadr x) (cadr y))))))
 
 
-          (font-loader (if (ly:get-option 'gs-font-load)
+          (font-loader (if (ly:get-option 'gs-load-fonts)
                            load-font-via-GS
                            load-font))
                         
@@ -518,8 +518,13 @@
           ;; the left-overshoot is to make sure that
           ;; bar numbers  stick out of margin uniformly.
           ;;
-          (list (min left-overshoot (car xext))
-                (car yext) (cdr xext) (cdr yext))))
+          (list
+
+           (if (ly:get-option 'pad-eps-boxes) 
+               (min left-overshoot (car xext))
+               (car xext))
+           (car yext) (cdr xext) (cdr yext))))
+        
         (rounded-bbox (to-bp-box bbox))
         (port (ly:outputter-port outputter))
         (header (eps-header paper rounded-bbox load-fonts?)))
@@ -539,7 +544,7 @@
 
     ;; skip booktitles.
     (if (and
-        (not (ly:get-option 'preview-include-book-title))
+        (not (ly:get-option 'include-book-title-preview))
         (pair? systems)
         (ly:prob-property (car systems) 'is-book-title #f))
 
@@ -590,15 +595,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))