* python/lilylib.py (make_ps_images): don't do showpage for

multi-page documents.

* VERSION (MY_PATCH_LEVEL): release 2.5.8

diff --git a/ChangeLog b/ChangeLog
index f8212afd358a91c0ab3138f9cb644a1509d4a30c..dc1d4f7e24080ce3b8ebec0d2beb947c4b405fb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * python/lilylib.py (make_ps_images): don't do showpage for
+       multi-page documents.
+       
+       * VERSION (MY_PATCH_LEVEL): release 2.5.8
+
 2005-01-16  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/lilypond.tely: changed order of appendices;

diff --git a/VERSION b/VERSION
index 05a322e8217a6359589eb32890b6c6c18a8f6526..6bbe0596f02aba83df013d42c635aa309bcccab1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=8
+PATCH_LEVEL=9
 MY_PATCH_LEVEL=
 

diff --git a/python/lilylib.py b/python/lilylib.py
index ec72f075f97540789e4b749655a7ae5f71ab87f1..49f03379ecdd2c4e56ed7c1bc3534d2a5a500877 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -516,7 +516,7 @@ def make_ps_images (ps_name, resolution = 90):
                if os.path.isfile (rmfile):
                        os.unlink (rmfile)
                
-               cmd = r'''gs -s  -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c showpage -c quit''' % (output_file,
+               cmd = r'''gs -s  -sDEVICE=pnggray  -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c quit''' % (output_file,
                                                                                                                                      resolution, ps_name)
 
        status = system (cmd)

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index af47663473730e9987c3f10be0970f7b010d1daf..a9bf0c27e5188bd983ab08fc6437c3fd823637ef 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -230,7 +230,7 @@ Syntax: @var{note}\\cr
 
 Syntax: @code{\\key } @var{name} @var{scale}.")
 
-       (internal-class-name . "Key_change_ev")
+       (internal-class-name . "Event")
        (types . (general-music key-change-event event))
        ))
     
@@ -568,7 +568,7 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g.
     (TransposedMusic
      . (
        (description .  "Music that has been transposed.")
-       (internal-class-name . "Transposed_music")
+       (internal-class-name . "Music_wrapper")
        (to-relative-callback . ,Relative_octave_music::no_relative_callback)
        (types . (music-wrapper-music general-music transposed-music))
        ))
@@ -587,7 +587,7 @@ Syntax @code{\\times @var{fraction} @var{music}}, e.g.
        (description .  "Music that can not be converted from relative to absolute notation.
 For example, transposed music.")
        (to-relative-callback . ,Relative_octave_music::no_relative_callback)
-       (internal-class-name . "Un_relativable_music")
+       (internal-class-name . "Music_wrapper")
        (types . (music-wrapper-music general-music unrelativable-music))
        ))
 
@@ -720,7 +720,7 @@ Syntax: @code{\\\\}")
     (VoltaRepeatedMusic
      . (
        (iterator-ctor . ,Volta_repeat_iterator::constructor)
-       (internal-class-name . "Repeated_music")
+       (internal-class-name . "Music")
        (description . "")
        (start-callback .  ,Repeated_music::first_start)
        (length-callback . ,Repeated_music::volta_music_length)
@@ -732,13 +732,13 @@ Syntax: @code{\\\\}")
        (iterator-ctor . ,Unfolded_repeat_iterator::constructor)
        (description .  "")
        (start-callback .  ,Repeated_music::first_start)
-       (internal-class-name . "Repeated_music")
+       (internal-class-name . "Music")
        (types . (general-music repeated-music unfolded-repeated-music))
        (length-callback . ,Repeated_music::unfolded_music_length)
        ))
     (PercentRepeatedMusic
      . (
-       (internal-class-name . "Repeated_music")
+       (internal-class-name . "Music")
        (description .  "Repeats encoded by percents.")
        (iterator-ctor . ,Percent_repeat_iterator::constructor)
        (start-callback .  ,Repeated_music::first_start)
@@ -750,7 +750,7 @@ Syntax: @code{\\\\}")
      . (
        (iterator-ctor . ,Chord_tremolo_iterator::constructor)
        (description .  "Repeated notes denoted by tremolo beams.")
-       (internal-class-name . "Repeated_music")
+       (internal-class-name . "Music")
        (start-callback .  ,Repeated_music::first_start)
 
        ;; the length of the repeat is handled by shifting the note logs
@@ -761,7 +761,7 @@ Syntax: @code{\\\\}")
     
     (FoldedRepeatedMusic
      . (
-       (internal-class-name . "Repeated_music")
+       (internal-class-name . "Music")
        (description .  "Repeats with alternatives placed in parallel. ")
        (iterator-ctor  . ,Folded_repeat_iterator::constructor)
        (start-callback .  ,Repeated_music::minimum_start)