From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 25 Oct 2004 21:01:36 +0000 (+0000)
Subject: (make_ps_images): return list of output files.
X-Git-Tag: release/2.3.25~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=42ee40ad2ab7555344b041db3f1b8c562476a63c;p=lilypond.git

(make_ps_images): return list of output files.
---

diff --git a/ChangeLog b/ChangeLog
index f57954dcd3..f54592be3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-10-25  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* python/lilylib.py (make_ps_images): return list of output files.
+
 	* lily/simple-spacer.cc (LY_DEFINE): for ragged, we can end with
 	all springs tight, and still satisfy the constraints.
 
diff --git a/python/lilylib.py b/python/lilylib.py
index 0f48d4dac0..61e47e7b27 100644
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -522,5 +522,6 @@ def make_ps_images (ps_name, resolution = 90):
 	cmd = r'''gs -s  -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c quit''' % (output_file,
 																      resolution, ps_name)
 
-	return output_file
+	files = glob.glob (re.sub ('%d', '*', output_file))
+	return files
 
diff --git a/scripts/ps2png.py b/scripts/ps2png.py
index a84e7ab476..5d45eddad3 100644
--- a/scripts/ps2png.py
+++ b/scripts/ps2png.py
@@ -66,7 +66,8 @@ for opt in options:
 		verbose_p = 1
 
 for f in files:
-	out = ly.make_ps_images (f, resolution = preview_resolution)
+	outfiles = ly.make_ps_images (f, resolution = preview_resolution)
 	## FIXME: silly message containing %d
-	sys.stderr.write (_ ("Wrote `%s'" % out))
+	
+	sys.stderr.write (_ ("Wrote `%s'" % string.join (outfiles, ', ')))
 	sys.stderr.write ('\n')