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

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

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 689478f291c4c8c401be20108294e861f8f337ca..c0f5b5ba5dc4a4eea99bf03664e17a190dc3419e 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -48,15 +48,24 @@
   
   ;; must be sure that we don't catch stuff from old GUBs.
   (search-executable '("gs")))
-
+  
 (define-public (postscript->pdf paper-width paper-height name)
-  (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
+  (let* ((pdf-name (string-append
+                   (basename (basename name ".ps") ".eps")
+                   ".pdf"))
+        (is-eps (string-match "\\.eps$" name))
+        (paper-size-string (if is-eps
+                               " -dEPSCrop "
+                               (format "-dDEVICEWIDTHPOINTS=~,2f \
+-dDEVICEHEIGHTPOINTS=~,2f "
+                                       paper-width paper-height )))
+
         (cmd (format #f
                      "~a\
  ~a\
  ~a\
+ ~a\
  -dCompatibilityLevel=1.4 \
- -dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f\
  -dNOPAUSE\
  -dBATCH\
  -r1200 \
@@ -67,11 +76,10 @@
 "
                      (search-gs)
                      (if (ly:get-option 'verbose) "" "-q")
-                     (if (ly:get-option 'gs-font-load)
+                     (if (ly:get-option 'gs-load-fonts)
                          " -dNOSAFER "
                          " -dSAFER ")
-                     paper-width
-                     paper-height
+                     paper-size-string
                      pdf-name
                      name)))
     ;; The wrapper on windows cannot handle `=' signs,
@@ -112,9 +120,10 @@
                      (lambda (x)
                        (member x formats)) 
                      completed)))
+
     (for-each
      (lambda (f)
-       ((eval (string->symbol (string-append "convert-to-" f)) module)
+       ((eval (string->symbol (format "convert-to-~a" f)) module)
        paper-book filename))
      completed)