From: Jan Nieuwenhuizen Date: Wed, 21 Apr 2004 11:57:38 +0000 (+0000) Subject: * input/regression/newaddlyrics.ly: Remove lilypond-book kludge. X-Git-Tag: release/2.3.1~53 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2a31ce479b0bb8cfe3fb0588c0e4e921ccb42896;p=lilypond.git * 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 9b622b7349..6efc1d0054 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-21 Jan Nieuwenhuizen + + * 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 * lily/stem-tremolo.cc (print): If stem direction == CENTER, move diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index 10af9e5119..daef387aef 100644 --- 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 2689e9bce3..d9ecc14ac7 100644 --- 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: