* lily/my-lily-lexer.cc (My_lily_lexer): don't crash

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 6ff5a07dc4e91961e6a997610141c3e0912b6512..5a7119fba26fd378019a80220280adea2a6fca8f 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -10,7 +10,7 @@
 */
 
 /*
-  Two shift/reduce problems:
+  Four shift/reduce problems:
 
 1.     foo = bar.
 
@@ -19,6 +19,12 @@
        "bar" -> String -> string-assignment
 
 
+Similar problem for
+
+ * \markup identifier.
+ * \markup { }
+
+
 2.  \repeat
        \repeat .. \alternative
 
@@ -291,7 +297,8 @@ yylex (YYSTYPE *s,  void * v)
 
 %type <i>      exclamations questions dots optional_rest
 %type <i>       bass_mod
-%type <scm>    grace_head 
+%type <scm>    grace_head
+%type <scm>    lyric_element
 %type <scm>    bass_number br_bass_figure bass_figure figure_list figure_spec
 %token <i>     DIGIT
 %token <scm>   NOTENAME_PITCH
@@ -2054,8 +2061,11 @@ simple_element:
                scm_gc_protect_object (mus);
                $$ = unsmob_music (mus);
        }
-       | STRING optional_notemode_duration     {
+       
+       | lyric_element optional_notemode_duration      {
                Input i = THIS->pop_spot ();
+               if (!THIS->lexer_->lyric_state_b ())
+                       THIS->parser_error (_ ("Have to be in Lyric mode for lyrics"));
 
                Music * lreq = MY_MAKE_MUSIC("LyricEvent");
                 lreq->set_mus_property ("text", $1);
@@ -2075,6 +2085,11 @@ simple_element:
        }
        ;
 
+lyric_element:
+       full_markup { $$ = $1 }
+       | STRING {  $$ = $1 ; }
+       ;
+
 new_chord:
        steno_tonic_pitch optional_notemode_duration   {
                $$ = make_chord ($1, $2, SCM_EOL);