Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 3b690e8980890b7ef3900723e8bf97ec8b6c7c60..59cbf58502275c853ff0f07e344f8e46d1dd635f 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -820,8 +820,20 @@ output_def_body:
 
 tempo_event:
        TEMPO steno_duration '=' bare_unsigned  {
-               $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4));
-       }                               
+               $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4));
+       }
+       | TEMPO string steno_duration '=' bare_unsigned {
+               $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5));
+       }
+       | TEMPO full_markup steno_duration '=' bare_unsigned    {
+               $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5));
+       }
+       | TEMPO string {
+               $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) );
+       }
+       | TEMPO full_markup {
+               $$ = MAKE_SYNTAX ("tempoText", @$, $2 );
+       }
        ;
 
 /*
@@ -1907,6 +1919,10 @@ bass_figure:
                        {
                        m->set_property ("no-continuation", SCM_BOOL_T);
                        }
+               else if ($2 == ly_symbol2scm ("backslash"))
+                       {
+                       m->set_property ("augmented-slash", SCM_BOOL_T);
+                       }
        }
        ;
 
@@ -1921,6 +1937,9 @@ figured_bass_modification:
        | '/'           {
                $$ = ly_symbol2scm ("slash");
        }
+       | E_BACKSLASH {
+               $$ = ly_symbol2scm ("backslash");
+       }
        ;
 
 br_bass_figure: