From ab17ec8e50cb68bef5db3ecb4b9315e16e8e9df7 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 7 Jun 2005 10:39:58 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog                   |  4 ++++
 scm/ps-to-png.scm           | 15 +++++++--------
 scripts/lilypond-ps2png.scm |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dd738ef47..7843c35841 100644
--- 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 8efbeea37a..d9c406acbc 100644
--- 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 ecef3dd5cb..9b70943886 100644
--- 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)))
-- 
2.39.5