* 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 3a95c5166dea6f9c2fd19dd857d1e667bbb02154..60e241ac16d0770cb275ffdc3991de09bdadb33a 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -115,7 +115,8 @@
        "page-width output-scale lily-output-units mul mul 0 translate 90 rotate\n"
        "")
     "%%EndPageSetup\n"
-
+    
+    "true setstrokeadjust\n"
     "gsave 0 paper-height translate "
     "set-ps-scale-to-lily-scale "
     "\n"))
@@ -408,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))
                         
@@ -446,6 +447,7 @@
                     (open-file filename "wb")
                     "ps"))
         (paper (ly:paper-book-paper book))
+        (systems (ly:paper-book-systems book))
         (page-stencils (map page-stencil (ly:paper-book-pages book)))
         
         (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
@@ -453,6 +455,9 @@
         (page-count (length page-stencils))
         (port (ly:outputter-port outputter)))
 
+    (if (ly:get-option 'dump-signatures)
+       (write-system-signatures basename (ly:paper-book-systems book) 1))
+  
     (output-scopes scopes fields basename)
     (display (file-header paper page-count #t) port)
 
@@ -513,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?)))
@@ -534,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))
 
@@ -585,12 +595,20 @@
 
 (define-public (convert-to-pdf book name)
   (let* ((defs (ly:paper-book-paper book))
-        (papersizename (ly:output-def-lookup defs 'papersizename)))
+        (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 (if (string? papersizename) papersizename "a4")
-                        name))))
+       (postscript->pdf w h name))))
 
 (define-public (convert-to-png book name)
   (let* ((defs (ly:paper-book-paper book))
@@ -598,10 +616,13 @@
         (resolution (if (number? defs-resolution)
                         defs-resolution
                         (ly:get-option 'resolution)))
-        (papersizename (ly:output-def-lookup defs 'papersizename)))
+        (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)))
 
     (postscript->png resolution
-                    (if (string? papersizename) papersizename "a4")
+                    (* paper-width output-scale (/ (ly:bp 1)))
+                    (* paper-height output-scale (/ (ly:bp 1)))
                     name)))
 
 (define-public (convert-to-dvi book name)