*** empty log message ***

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

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index 6943b976105958171199746da36c3b6fcd4677a3..689478f291c4c8c401be20108294e861f8f337ca 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -2,7 +2,7 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c)  2005 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;; (c) 2005--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 
@@ -27,9 +27,11 @@
          (throw 'ly-file-failed)))))
 
 (define-public (sanitize-command-option str)
+  "Kill dubious shell quoting"
+  
   (string-append
    "\""
-   (regexp-substitute/global #f "[^- 0-9,.a-zA-Z'\"\\]" str 'pre 'post)
+   (regexp-substitute/global #f "[^-_ 0-9,.a-zA-Z'\"\\]" str 'pre 'post)
    "\""))
 
 (define-public (search-executable names)
@@ -43,16 +45,18 @@
     (helper path names)))
 
 (define-public (search-gs)
-  (search-executable '("gs-nox" "gs-8.15" "gs")))
+  
+  ;; must be sure that we don't catch stuff from old GUBs.
+  (search-executable '("gs")))
 
-(define-public (postscript->pdf papersizename name)
+(define-public (postscript->pdf paper-width paper-height name)
   (let* ((pdf-name (string-append (basename name ".ps") ".pdf"))
         (cmd (format #f
                      "~a\
  ~a\
  ~a\
  -dCompatibilityLevel=1.4 \
- -sPAPERSIZE=~a\
+ -dDEVICEWIDTHPOINTS=~,2f -dDEVICEHEIGHTPOINTS=~,2f\
  -dNOPAUSE\
  -dBATCH\
  -r1200 \
@@ -66,7 +70,8 @@
                      (if (ly:get-option 'gs-font-load)
                          " -dNOSAFER "
                          " -dSAFER ")
-                     (sanitize-command-option papersizename)
+                     paper-width
+                     paper-height
                      pdf-name
                      name)))
     ;; The wrapper on windows cannot handle `=' signs,
@@ -86,16 +91,16 @@
 
 (use-modules (scm ps-to-png))
 
-(define-public (postscript->png resolution paper-size-name name)
+(define-public (postscript->png resolution paper-width paper-height 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 ((paper-size (sanitize-command-option paper-size-name))
-       (verbose (ly:get-option 'verbose))
+  (let ((verbose (ly:get-option 'verbose))
        (rename-page-1 #f))
+
     (ly:message (_ "Converting to ~a...") "PNG")
-    (make-ps-images name resolution paper-size rename-page-1 verbose
+    (make-ps-images name resolution paper-width paper-height rename-page-1 verbose
                    (ly:get-option 'anti-alias-factor))
     (ly:progress "\n")))