From d4694123961690b173377b3c3a199d5a24c66a9d Mon Sep 17 00:00:00 2001
From: David Kastrup <dak@gnu.org>
Date: Thu, 1 Nov 2012 15:16:52 +0100
Subject: [PATCH] parser/lexer: eliminate LYRIC_MARKUP as a token separate from
 MARKUP (2996/2)

---
 lily/lexer.ll  |  3 +--
 lily/parser.yy | 25 +++++--------------------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/lily/lexer.ll b/lily/lexer.ll
index cad0700548..63d58527e8 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -902,8 +902,7 @@ Lily_lexer::scan_escaped_word (string str)
 
         yylval = SCM_UNSPECIFIED;
 	int i = lookup_keyword (str);
- 	if (i == MARKUP && is_lyric_state ())
- 		return LYRIC_MARKUP;
+
 	if (i != -1)
 		return i;
 
diff --git a/lily/parser.yy b/lily/parser.yy
index 81a8e4dc1d..4a329084c0 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -328,7 +328,6 @@ If we give names, Bison complains.
 %token HYPHEN "--"
 
 %token CHORDMODIFIERS
-%token LYRIC_MARKUP
 %token MULTI_MEASURE_REST
 
 
@@ -498,7 +497,6 @@ embedded_scm_bare_arg:
 	{
 		$$ = parser->lexer_->eval_scm_token ($1);
 	}
-	| full_markup
 	| full_markup_list
 	| context_modification
 	| score_block
@@ -1275,7 +1273,7 @@ function_arglist_closed_nonbackup:
 				       try_string_variants ($2, $4),
 				       $3, $2, $4);
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist lyric_markup
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist full_markup
 	{
 		$$ = check_scheme_arg (parser, @4, $4, $3, $2);
 	}
@@ -1378,7 +1376,7 @@ function_arglist_nonbackup_reparse:
 		else
 			MYREPARSE (@4, $2, SCM_ARG, $4);
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist lyric_markup
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist full_markup
 	{
 		$$ = $3;
 		if (scm_is_true (scm_call_1 ($2, $4)))
@@ -1424,7 +1422,7 @@ function_arglist_backup:
 			MYBACKUP (EVENT_IDENTIFIER, $4, @4);
 		}
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep lyric_markup
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep full_markup
 	{
 		if (scm_is_true (scm_call_1 ($2, $4)))
 			$$ = scm_cons ($4, $3);
@@ -1660,7 +1658,7 @@ function_arglist_common_reparse:
 			// know the predicate to be false.
 			MYREPARSE (@3, $1, SCM_ARG, $3);
 	}
-	| EXPECT_SCM function_arglist_optional lyric_markup
+	| EXPECT_SCM function_arglist_optional full_markup
 	{
 		$$ = $2;
 		if (scm_is_true (scm_call_1 ($1, $3)))
@@ -3035,7 +3033,7 @@ simple_chord_elements:
 	;
 
 lyric_element:
-	lyric_markup {
+	full_markup {
 		$$ = $1;
 	}
 	| STRING {
@@ -3206,19 +3204,6 @@ questions:
         }
 	;
 
-/*
-This should be done more dynamically if possible.
-*/
-
-lyric_markup:
-	LYRIC_MARKUP
-		{ parser->lexer_->push_markup_state (); }
-	markup_top {
-		$$ = $3;
-		parser->lexer_->pop_state ();
-	}
-	;
-
 full_markup_list:
 	MARKUPLIST
 		{ parser->lexer_->push_markup_state (); }
-- 
2.39.2