Enable in the parser markup list commands taking 1 scheme argument.

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 71fb56b385c6d86205a735ed18c2ff0d75afb95c..71fb2479eec8596df6d390f989aa0b46f9176782 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -551,6 +551,8 @@ BOM_UTF8    \357\273\277
                        SCM tag = scm_cdr(s2);
                        if (tag == ly_symbol2scm("empty"))
                                return MARKUP_LIST_HEAD_EMPTY;
+                       else if (tag == ly_symbol2scm ("scheme0"))
+                               return MARKUP_LIST_HEAD_SCM0;
                        else if (tag == ly_symbol2scm ("markup-list0"))
                                return MARKUP_LIST_HEAD_LIST0;
                        else if (tag == ly_symbol2scm ("scheme0-markup-list1"))
@@ -558,7 +560,7 @@ BOM_UTF8    \357\273\277
                        else if (tag == ly_symbol2scm ("scheme0-scheme1-markup-list2"))
                                return MARKUP_LIST_HEAD_SCM0_SCM1_LIST2;
                        else {
-                               programming_error ("no parser tag defined for this markup signature"); 
+                               programming_error ("no parser tag defined for this markup list signature"); 
                                ly_display_scm (s);
                                assert(false);
                        }

diff --git a/lily/parser.yy b/lily/parser.yy
index 7ded9b737792b741947be52f450523df55ffd7b6..8fc0a89c1b417a394c9f027eb0f756baf4d49dca 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
@@ -2276,6 +2277,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);
        }