From 542b131840593f83c5ec22563f3eddb54b4e039c Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 8 Mar 2005 12:00:52 +0000
Subject: [PATCH] * lily/lexer.ll (Lily_lexer): * lily/parser.yy: Junk
 lyric_markup state.

---
 ChangeLog                  |  3 +++
 lily/include/lily-lexer.hh |  1 -
 lily/lexer.ll              | 13 +++----------
 lily/parser.yy             |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 51b632aa41..493a70dab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* lily/lexer.ll (Lily_lexer):
+	* lily/parser.yy: Junk lyric_markup state.
+
 	* Documentation/topdocs/NEWS.tely (Top): Mention markup text feature.
 
 	* scripts/lilypond-book.py (PREAMBLE_LY): toplevel-music-handler:
diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index b5b4321969..fbc06b6367 100644
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -71,7 +71,6 @@ public:
   void push_figuredbass_state ();
   void push_lyric_state ();
   void push_initial_state ();
-  void push_lyric_markup_state ();
   void push_markup_state ();
   void push_note_state (SCM tab);
   void pop_state ();
diff --git a/lily/lexer.ll b/lily/lexer.ll
index d17fc71026..2372e68278 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -107,7 +107,6 @@ SCM (* scm_parse_error_handler) (void *);
 %x figures
 %x incl
 %x lyrics
-%x lyric_markup
 %x lyric_quote
 %x longcomment
 %x markup
@@ -150,7 +149,7 @@ HYPHEN		--
 	// windows-suck-suck-suck
 }
 
-<INITIAL,chords,figures,incl,lyrics,lyric_markup,markup,notes>{
+<INITIAL,chords,figures,incl,lyrics,markup,notes>{
   "%{"	{
 	yy_push_state (longcomment);
   }
@@ -275,7 +274,7 @@ HYPHEN		--
 <chords,notes,figures>R		{
 	return MULTI_MEASURE_REST;
 }
-<INITIAL,chords,figures,lyrics,lyric_markup,markup,notes>#	{ //embedded scm
+<INITIAL,chords,figures,lyrics,markup,notes>#	{ //embedded scm
 	int n = 0;
 	Input hi = here_input();
 	hi.step_forward ();
@@ -475,7 +474,7 @@ HYPHEN		--
 }
 
 
-<markup,lyric_markup>{
+<markup>{
 	\" {
 		start_quote ();
 	}
@@ -652,12 +651,6 @@ Lily_lexer::push_markup_state ()
 	yy_push_state (markup);
 }
 
-void
-Lily_lexer::push_lyric_markup_state ()
-{
-	yy_push_state (lyric_markup);
-}
-
 void
 Lily_lexer::push_note_state (SCM tab)
 {
diff --git a/lily/parser.yy b/lily/parser.yy
index f358cf9991..fe8dbee582 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2434,7 +2434,7 @@ lyric_markup:
 		$$ = $1;
 	}
 	| LYRIC_MARKUP
-		{ THIS->lexer_->push_lyric_markup_state (); }
+		{ THIS->lexer_->push_markup_state (); }
 	markup_top {
 		$$ = $3;
 		THIS->lexer_->pop_state ();
-- 
2.39.5