From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Mon, 9 Jul 2007 12:24:02 +0000 (+0200)
Subject: Enable in the parser markup list commands taking 1 scheme argument.
X-Git-Tag: release/2.11.28-1~24
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=033879e52460a019a63eccf67514d4a58853f67e;p=lilypond.git

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

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 71fb56b385..71fb2479ee 100644
--- 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 7ded9b7377..8fc0a89c1b 100644
--- 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);
 	}