From e70b859dd30b27fb61719f665df83cb594511c76 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 21 Jul 2002 22:58:44 +0000 Subject: [PATCH] * input/test/mark.ly: * Documentation/user/refman.itely: Re-enable \mark #'() example. * lily/parser.yy: Revert to MARK scalar. --- ChangeLog | 7 +++++++ Documentation/user/refman.itely | 3 +-- input/test/mark.ly | 2 +- lily/parser.yy | 9 +-------- make/ly-rules.make | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index b86cb4caca..2a75b3b51e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-07-22 Jan Nieuwenhuizen + + * input/test/mark.ly: + * Documentation/user/refman.itely: Re-enable \mark #'() example. + + * lily/parser.yy: Revert to MARK scalar. + 2002-07-21 Han-Wen * lily/accidental-placement.cc (stagger_apes): try to arrange accs diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index ba3d6aa035..4984de1ae9 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3115,8 +3115,7 @@ To print a rehearsal mark, use the @code{\mark} command. c1 \mark \default c1 \mark "12" c1 \mark \default -%% FIXME -%% c1 \mark #'(music "scripts-segno") + c1 \mark #'(music "scripts-segno") c1 } @end lilypond diff --git a/input/test/mark.ly b/input/test/mark.ly index 722394b297..ee0fddc045 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -8,7 +8,7 @@ global = \notes { s1 | \mark "12" s1 | \mark \default s1 | \mark "A2" -%% FIXME s1 | \mark #'(music "scripts-segno") + s1 | \mark #'(music "scripts-segno") s1 } diff --git a/lily/parser.yy b/lily/parser.yy index 9a352e06e8..9bac8a5683 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1318,18 +1318,11 @@ verbose_command_req: Mark_req * m = new Mark_req; $$ = m; } - | MARK STRING { + | MARK scalar { Mark_req *m = new Mark_req; m->set_mus_property ("label", $2); $$ = m; } - | MARK bare_unsigned { - String s(to_str ($2)); - - Mark_req *m = new Mark_req; - m->set_mus_property ("label", gh_int2scm ($2)); - $$ = m; - } | PENALTY SCM_T { Break_req * b = new Break_req; SCM s = $2; diff --git a/make/ly-rules.make b/make/ly-rules.make index acaa410b18..e409630ef1 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -13,13 +13,13 @@ $(LILYPOND_BOOK_FLAGS) --verbose --dependencies --outdir=$(outdir) $< # it is not, for --srcdir builds $(outdir)/%.texi: %.tely rm -f $@ - set|egrep '(TEX|LILY)' - + set|egrep '(TEX|LILY)' # ugh, what's this? $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $< chmod -w $@ $(outdir)/%.texi: $(outdir)/%.tely rm -f $@ + set|egrep '(TEX|LILY)' # ugh, what's this? $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $(LILYPOND_BOOK_FLAGS) $< rm -f $< chmod -w $@ -- 2.39.5