CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/07 10:39:59
Modified files:
. : ChangeLog
scm : ps-to-png.scm
scripts : lilypond-ps2png.scm
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3731&tr2=1.3732&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/ps-to-png.scm.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-ps2png.scm.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3731 lilypond/ChangeLog:1.3732
--- lilypond/ChangeLog:1.3731 Tue Jun 7 07:45:32 2005
+++ lilypond/ChangeLog Tue Jun 7 10:39:56 2005
@@ -12,6 +12,10 @@
2005-06-07 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
Index: lilypond/scm/ps-to-png.scm
diff -u lilypond/scm/ps-to-png.scm:1.3 lilypond/scm/ps-to-png.scm:1.4
--- lilypond/scm/ps-to-png.scm:1.3 Tue Jun 7 07:45:31 2005
+++ lilypond/scm/ps-to-png.scm Tue Jun 7 10:39:58 2005
@@ -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?
Index: lilypond/scripts/lilypond-ps2png.scm
diff -u lilypond/scripts/lilypond-ps2png.scm:1.1
lilypond/scripts/lilypond-ps2png.scm:1.2
--- lilypond/scripts/lilypond-ps2png.scm:1.1 Mon Jun 6 07:57:05 2005
+++ lilypond/scripts/lilypond-ps2png.scm Tue Jun 7 10:39:58 2005
@@ -98,7 +98,7 @@
(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)))
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
