* scm/paper.scm (paper-alist): public.

* scm/framework-tex.scm (convert-to-ps):
* scm/lily.scm (postscript->pdf): Do not leak papersizename into
command line.  (backportme)

diff --git a/ChangeLog b/ChangeLog
index 14ceefa95422832f203a48285e597018022d6a12..57f7a0bc0512e7e7dd27cf090a8f6557d29c706e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-11-06  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/paper.scm (paper-alist): public.
+       * scm/framework-tex.scm (convert-to-ps):
+       * scm/lily.scm (postscript->pdf): Do not leak papersizename into
+       command line.  (backportme)
+
 2004-11-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scm/lily.scm (ly:system): add > /dev/null 2>&1 

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 11083657aa684bf1b41693df6a1fd6b591d7c412..45c784096de0b2ec4f8d349a8f085e3a33e64489 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -284,14 +284,15 @@
         (cmd (string-append "dvips "
                             (if preview?
                                 " -E "
-                                (string-append " -t " papersizename))
+                                (if (member papersizename
+                                            (map car paper-alist))
+                                    (string-append "-t " papersizename)
+                                    ""))
                             (if landscape?
                                 " -t landscape "
                                 " ")
                             "  -u+ec-mftrace.map -u+lilypond.map -Ppdf "
-                            base
-
-                            )))
+                            base)))
 
     (if (not (ly:get-option 'verbose))
        (begin

diff --git a/scm/lily.scm b/scm/lily.scm
index a8117bd18ac97002bcdf19cedacb792f5750034c..f870cb6254483fd7b681d991a64a22c72d5ebfc3 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -581,16 +581,18 @@ possibly turned off."
 
 ;;
 ;; ugh  -   double check this. We are leaking
-;; untrusted (user-settable) info to a command-line 
+;; untrusted (user-settable) info to a command-line
 ;;
+;; (regexp-substitute/global #f "[^[:alnum:]]" papersizename 'pre 'post))
 (define-public (postscript->pdf papersizename name)
-  (let* ((cmd (string-append "ps2pdf -sPAPERSIZE=" papersizename " " name))
-        (output-name
-         (regexp-substitute/global #f "\\.ps" name 'pre ".pdf" 'post)))
-    (format (current-error-port) (_ "Converting to `~a'...") output-name)
+  (let* ((set-papersize (if (member papersizename (map car paper-alist))
+                           (string-append "-sPAPERSIZE=" papersizename " ")
+                           ""))
+        (cmd (string-append "ps2pdf " set-papersize name))
+        (pdf-name (string-append (basename name ".ps") ".pdf" )))
+    (format (current-error-port) (_ "Converting to `~a'...") pdf-name)
     (ly:system cmd)))
 
-
 (define-public (postscript->png resolution name)
   (let
       ((cmd (string-append

diff --git a/scm/paper.scm b/scm/paper.scm
index a73549291e5e611be7de9e52692c4fccc2b6a794..0f747a15649e3e68f6e8b56d8cf8ab7f1969253c 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -65,7 +65,7 @@
     (set-current-module old-mod)
     (module-define! old-mod '$defaultpaper new-paper)))
 
-(define paper-alist
+(define-public paper-alist
   '(("a6" . (cons (* 105 mm) (* 148.95 mm)))
     ("a5" . (cons (* 148.95 mm) (* 210 mm)))
     ("a4" . (cons (* 210 mm) (* 297.9 mm)))