From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 1 Dec 2002 16:01:26 +0000 (+0000)
Subject: * input/regression/new-markup-syntax.scm: new file
X-Git-Tag: release/1.7.9~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4f4c5525290d6022ceabbcd45f580fb66b796fd0;p=lilypond.git

* input/regression/new-markup-syntax.scm: new file

* lily/lexer.ll: preliminary \markup syntax.
---

diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
new file mode 100644
index 0000000000..bd6725b384
--- /dev/null
+++ b/input/regression/new-markup-syntax.ly
@@ -0,0 +1,18 @@
+\header  {
+texidoc = "New markup syntax."
+}
+
+\version "1.7.8"
+
+
+\score {
+  \notes
+   {
+    \property Voice.TextScript \set #'molecule-callback = #brew-new-markup-molecule
+    f'-\markup { foo \bold bar \column < baz bazr >
+		\override #'(font-family . music) \lookup #"noteheads-0"
+	}
+
+    c''4
+    }
+}
diff --git a/input/regression/new-markup-syntax.scm b/input/regression/new-markup-syntax.scm
deleted file mode 100644
index f91d9c3cf8..0000000000
--- a/input/regression/new-markup-syntax.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-\header  {
-texidoc = "New markup syntax."
-
-}
-\version "1.7.8"
-
-
-\score {
-  \notes \transpose c d
-%\apply #display-music
-   {
-    \property Voice.TextScript \set #'molecule-callback = #brew-new-markup-molecule
-    eses'-\markup { foo \bold bar \column < baz bazr >
-		\override #'(font-family . music) \lookup #"noteheads-0"
-	} }
-}
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)
 {