Merge branch 'master' into dev/texi2html

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index 7ded9b737792b741947be52f450523df55ffd7b6..59cbf58502275c853ff0f07e344f8e46d1dd635f 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -284,6 +284,7 @@ If we give names, Bison complains.
 %token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
 %token <scm> MARKUP_LIST_HEAD_EMPTY
 %token <scm> MARKUP_LIST_HEAD_LIST0
+%token <scm> MARKUP_LIST_HEAD_SCM0
 %token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
 %token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
 %token <scm> MARKUP_IDENTIFIER
@@ -719,7 +720,7 @@ score_body:
                $$->user_key_ = ly_scm2string ($2);
        }
        | score_body lilypond_header    {
-               $$->header_ = $2;
+               $$->set_header ($2);
        }
        | score_body output_def {
                if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
@@ -819,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 );
+       }
        ;
 
 /*
@@ -1906,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);
+                       }
        }
        ;
 
@@ -1920,6 +1937,9 @@ figured_bass_modification:
        | '/'           {
                $$ = ly_symbol2scm ("slash");
        }
+       | E_BACKSLASH {
+               $$ = ly_symbol2scm ("backslash");
+       }
        ;
 
 br_bass_figure:
@@ -2276,6 +2296,9 @@ markup_command_list:
        | MARKUP_LIST_HEAD_LIST0 markup_list    {
                $$ = scm_list_2 ($1, $2);
        }
+       | MARKUP_LIST_HEAD_SCM0 embedded_scm    {
+               $$ = scm_list_2 ($1, $2);
+       }
        | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list  {
                $$ = scm_list_3 ($1, $2, $3);
        }