*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 4dd738ef475be060ed6024a28e3848bbfe8a934b..7843c358411157497976a3b40de1044b814fd0c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
 
 2005-06-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * scm/ps-to-png.scm (make-ps-images): no paper size for multi-page.
+
+       * scripts/lilypond-ps2png.scm
+
        * VERSION (PACKAGE_NAME): release 2.5.28
 
 2005-06-07  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 8efbeea37a55f1c3301bfcc9f6adc1fe3ae8e17b..d9c406acbc395bbe61f53dd378d2c2994dea8c6e 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -72,10 +72,10 @@
          (multi-page? (and (string-match "\n%%Pages: " header)
                            (not (string-match "\n%%Pages: 1\n" header))))
          (output-file (if multi-page? pngn png1))
+
          ;;png16m is because Lily produces color nowadays.
-         (cmd (format #f (if multi-page?
-                             "gs\
- -dEPSCrop\
+         (cmd (if multi-page?
+                  (format #f "gs\
  -dGraphicsAlphaBits=4\
  -dNOPAUSE\
  -dTextAlphaBits=4\
@@ -86,20 +86,19 @@
  -r~S\
  '~a'\
  -c showpage\
- -c quit"
-                             "gs\
+ -c quit" output-file paper-size resolution ps-name)
+                  (format #f "gs\
  -s\
  -dGraphicsAlphaBits=4\
+ -dEPSCrop\
  -dNOPAUSE\
  -dTextAlphaBits=4\
  -sDEVICE=png16m\
  -sOutputFile='~a'\
- -sPAPERSIZE=~a\
  -q\
  -r~S\
  '~a'\
- -c quit")
-                      output-file paper-size resolution ps-name))
+ -c quit" output-file resolution ps-name)))
          (foo (for-each delete-file (append (dir-re "." png1)
                                             (dir-re "." pngn-re))))
          (bar (if verbose?

diff --git a/scripts/lilypond-ps2png.scm b/scripts/lilypond-ps2png.scm
index ecef3dd5cbe6095ee14b05015043c9e942774c11..9b70943886b6171e6af737fbd1548fa51c7213fc 100644 (file)
--- a/scripts/lilypond-ps2png.scm
+++ b/scripts/lilypond-ps2png.scm
@@ -98,7 +98,7 @@ Options:
      (lambda
       (x)
       (let ((png-files
-            (make-ps-images x paper-size resolution rename-page-1 verbose?)))
+            (make-ps-images x resolution paper-size rename-page-1 verbose?)))
        (format (current-error-port) (_ "Wrote `~a'") (string-join png-files))
        (newline (current-error-port))))
      files)))