* input/regression/newaddlyrics.ly: Remove lilypond-book kludge.

* scripts/lilypond-book.py: LY code that includes \header is
not assumed to be a fragment.

diff --git a/ChangeLog b/ChangeLog
index 9b622b7349f0c46908abc63376f092fd6286328c..6efc1d00548955f6ac24aa8373cc8ff7310b02d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-21  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/regression/newaddlyrics.ly: Remove lilypond-book kludge.
+
+       * scripts/lilypond-book.py: LY code that includes \header is
+       not assumed to be a fragment.
+
 2004-04-20  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/stem-tremolo.cc (print): If stem direction == CENTER, move

diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly
index 10af9e51196e019afecdc28f6ac0454b0b9ac015..daef387aef11f80b04648b9b94e5bb5764496a24 100644 (file)
--- a/input/regression/newaddlyrics.ly
+++ b/input/regression/newaddlyrics.ly
@@ -2,14 +2,6 @@
     texidoc = "newlyrics -- multiple stanzas broken as yet."
 }
 
-%{
-
-UGHr, fool lilypond-book:
-
-\score
-
-%}
-
 %% Testing newlyrics 
 %%\new PianoStaff <<
 <<

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 2689e9bce35c1e86e600aaf7c45f543117464ef4..d9ecc14ac72e01298d5c791714a8c7fabd83ae73 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -347,7 +347,7 @@ def compose_ly (code, options):
        if QUOTE in options and LINEWIDTH in options:
                options.remove (LINEWIDTH)
 
-       m = re.search (r'''\\score''', code)
+       m = re.search (r'''\\(header|score)''', code)
        if not m and (not options \
                      or not NOFRAGMENT in options or FRAGMENT in options):
                if RAGGEDRIGHT not in options: