* input/test/mark.ly:

* Documentation/user/refman.itely: Re-enable \mark #'() example.

* lily/parser.yy: Revert to MARK scalar.

diff --git a/ChangeLog b/ChangeLog
index b86cb4cacad1684524dbf1ef04dd3c3a0b7721b4..2a75b3b51e1f04b294e351d66f55d347c5203c29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/test/mark.ly: 
+       * Documentation/user/refman.itely: Re-enable \mark #'() example.
+
+       * lily/parser.yy: Revert to MARK scalar.
+
 2002-07-21  Han-Wen  <hanwen@cs.uu.nl>
 
        * lily/accidental-placement.cc (stagger_apes): try to arrange accs

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index ba3d6aa03532e82e0e912bca821e322fc526a0d3..4984de1ae9583f81bca02603145cb41566f09f4b 100644 (file)
--- 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 722394b297387813e46c632a9075196ea27f71e6..ee0fddc045f6ad3527f598212daf5c703b65975a 100644 (file)
--- 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 9a352e06e868363af38fd90f16c00c8a83d4becd..9bac8a5683410f884b9be188cd83f894f9046495 100644 (file)
--- 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 acaa410b18785742f3bafddfac3b6b5712019cd4..e409630ef1adf2c1c1088ef01332f05f3179fa85 100644 (file)
--- 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 $@