Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scm / backend-library.scm

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 689478f291c4c8c401be20108294e861f8f337ca..731dcf083e79a140d77c0645b9950a6a2d7fd597 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -49,14 +49,14 @@
   ;; must be sure that we don't catch stuff from old GUBs.
   (search-executable '("gs")))
 
-(define-public (postscript->pdf paper-width paper-height name)
+(define-public (postscript->pdf papersizename name)
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
         (cmd (format #f
                      "~a\
  ~a\
  ~a\
  -dCompatibilityLevel=1.4 \
- -dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f\
+ -sPAPERSIZE=~a\
  -dNOPAUSE\
  -dBATCH\
  -r1200 \
@@ -70,8 +70,7 @@
                      (if (ly:get-option 'gs-font-load)
                          " -dNOSAFER "
                          " -dSAFER ")
-                     paper-width
-                     paper-height
+                     (sanitize-command-option papersizename)
                      pdf-name
                      name)))
     ;; The wrapper on windows cannot handle `=' signs,
@@ -91,16 +90,17 @@
 
 (use-modules (scm ps-to-png))
 
-(define-public (postscript->png resolution paper-width paper-height name)
+(define-public (postscript->png resolution paper-size-name name)
     ;; Do not try to guess the name of the png file,
     ;; GS produces PNG files like BASE-page%d.png.
     ;;(ly:message (_ "Converting to `~a'...")
     ;;     (string-append (basename name ".ps") "-page1.png" )))
-  (let ((verbose (ly:get-option 'verbose))
+  (let ((paper-size (sanitize-command-option paper-size-name))
+       (verbose (ly:get-option 'verbose))
        (rename-page-1 #f))
 
     (ly:message (_ "Converting to ~a...") "PNG")
-    (make-ps-images name resolution paper-width paper-height rename-page-1 verbose
+    (make-ps-images name resolution paper-size rename-page-1 verbose
                    (ly:get-option 'anti-alias-factor))
     (ly:progress "\n")))