(make_ps_images): return list of output files.

diff --git a/ChangeLog b/ChangeLog
index f57954dcd321e469259ba395cbc791bbde6794a1..f54592be3aa78f0cbdcda29fe87d1398dcf97a0b 100644 (file)
--- 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 0f48d4dac05465d0e1bc156d0fa938a0106ab7a5..61e47e7b27af329cf1d0e6fb4d8fce603781f0c1 100644 (file)
--- 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 a84e7ab476d2e1168d57142e11fd4d266f34d9a1..5d45eddad3d34563c5ac57c9662bd102588627f6 100644 (file)
--- 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')