(make_ps_images): switch back to png16m.

diff --git a/ChangeLog b/ChangeLog
index ecc1bc8875f3a7cf981170469215e8a5d889b74b..01ac7dceed706c2e5fb43d3b218402a55161f7da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * python/lilylib.py (make_ps_images): switch back to png16m.
+       
 2005-04-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * scripts/lilypond-book.py (write_if_updated): Bugfix for not

diff --git a/python/lilylib.py b/python/lilylib.py
index c21f25386a1f1ee789f826aa53631b031901df30..2c5cc1620999b7b0e1b5aa14b297b9e9bc164537 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -464,26 +464,22 @@ def get_bbox (filename):
 
 def make_ps_images (ps_name, resolution = 90, papersize = "a4",
                    rename_page1_p = 0):
-       ## FIXME
-       ## have better algorithm for deciding when to crop page,
-       ## and when to show full page.
-       ## Better than what, and why?
-
-       base = re.sub (r'\.e?ps', '', ps_name)
+       base = os.path.basename (re.sub (r'\.e?ps', '', ps_name))
        header = open (ps_name).read (1024)
 
        png1 = base + '.png'
        pngn = base + '-page%d.png'
        output_file = pngn
        multi_page = re.search ('\n%%Pages: ', header)
-       
+
+       # png16m is because Lily produces color nowadays.
        if not multi_page:
                cmd = r'''gs\
                -dEPSCrop\
                -dGraphicsAlphaBits=4\
                -dNOPAUSE\
                -dTextAlphaBits=4\
-               -sDEVICE=pnggray\
+               -sDEVICE=png16m\
                -sOutputFile='%(output_file)s'\
                -sPAPERSIZE=%(papersize)s\
                -q\
@@ -497,7 +493,7 @@ def make_ps_images (ps_name, resolution = 90, papersize = "a4",
                -dGraphicsAlphaBits=4\
                -dNOPAUSE\
                -dTextAlphaBits=4\
-               -sDEVICE=pnggray\
+               -sDEVICE=png16m\
                -sOutputFile='%(output_file)s'\
                -sPAPERSIZE=%(papersize)s\
                -q\

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index eab2014dd8dbcb9af246d808b898071c3725b194..bacaa7fce36627c7423ea64fdda387aa78de32a8 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1388,7 +1388,9 @@
        (height . 2.0) ;; staffspace;
        (minimum-space . 5)
        (font-size . -4)
-       (meta . ((interfaces . (volta-bracket-interface line-interface text-interface side-position-interface font-interface spanner-interface))))
+       (meta . ((interfaces . (volta-bracket-interface
+                               line-interface text-interface
+                               side-position-interface font-interface spanner-interface))))
        ))
 
     (VerticalAlignment
@@ -1397,7 +1399,6 @@
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)
        (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        (stacking-dir . -1)
-       ;; (threshold . (6 . 1000))
        (meta . ((interfaces . (align-interface axis-group-interface spanner-interface))))
        ))
 
@@ -1407,13 +1408,10 @@
        (Y-extent-callback . ,Axis_group_interface::group_extent_callback)      
        (X-extent-callback . ,Axis_group_interface::group_extent_callback)
        
-       (meta . ((interfaces . (axis-group-interface vertically-spaceable-interface spanner-interface))))
+       (meta . ((interfaces . (axis-group-interface
+                               vertically-spaceable-interface spanner-interface))))
        ))
-   )
- )
-
-
-
+   ))
 
 (define (completize-grob-entry x)
   "transplant assoc key into 'name entry of 'meta of X

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index 22d6e72ef53da4b927dbce198e2387b08aeaf79c..561514f1f3666627dca064c885708d743d275baa 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -524,7 +524,7 @@ A negative @var{amount} indicates raising, see also @code{\raise}.
 (def-markup-command (raise layout props amount arg) (number? markup?)
   "
 Raise @var{arg}, by the distance @var{amount}.
-A negative @var{amount} indicates lowering, see also @code{\lower}.
+A negative @var{amount} indicates lowering, see also @code{\\lower}.
 @c
 @lilypond[verbatim,fragment,relative=1]
  c1^\\markup { C \\small \\raise #1.0 \\bold { \"9/7+\" }}