From 4f4c5525290d6022ceabbcd45f580fb66b796fd0 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 1 Dec 2002 16:01:26 +0000
Subject: [PATCH] * input/regression/new-markup-syntax.scm: new file

* lily/lexer.ll: preliminary \markup syntax.
---
 .../{new-markup-syntax.scm => new-markup-syntax.ly}  | 12 +++++++-----
 lily/lexer.ll                                        | 11 ++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)
 rename input/regression/{new-markup-syntax.scm => new-markup-syntax.ly} (67%)

diff --git a/input/regression/new-markup-syntax.scm b/input/regression/new-markup-syntax.ly
similarity index 67%
rename from input/regression/new-markup-syntax.scm
rename to input/regression/new-markup-syntax.ly
index f91d9c3cf8..bd6725b384 100644
--- a/input/regression/new-markup-syntax.scm
+++ b/input/regression/new-markup-syntax.ly
@@ -1,16 +1,18 @@
 \header  {
 texidoc = "New markup syntax."
-
 }
+
 \version "1.7.8"
 
 
 \score {
-  \notes \transpose c d
-%\apply #display-music
+  \notes
    {
     \property Voice.TextScript \set #'molecule-callback = #brew-new-markup-molecule
-    eses'-\markup { foo \bold bar \column < baz bazr >
+    f'-\markup { foo \bold bar \column < baz bazr >
 		\override #'(font-family . music) \lookup #"noteheads-0"
-	} }
+	}
+
+    c''4
+    }
 }
diff --git a/lily/lexer.ll b/lily/lexer.ll
index 39c9ce81d7..c78ee41cb6 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -469,14 +469,8 @@ HYPHEN		--
 		} else
 			return scan_escaped_word (str);
 	}
-	{WORD} {
-		/* ugr. This sux. */
+	{LYRICS} {
 		String s (YYText ()); 
-		if (s == "__")
-			return yylval.i = EXTENDER;
-		if (s == "--")
-			return yylval.i = HYPHEN;
-		s = lyric_fudge (s);
 
 		char c = s[s.length () - 1];
 		if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
@@ -744,6 +738,9 @@ valid_version_b (String s)
 }
 	
 
+/*
+  substittute _ adn \,
+*/
 String
 lyric_fudge (String s)
 {
-- 
2.39.5