From: David Kastrup <dak@gnu.org>
Date: Sun, 10 Aug 2014 19:41:12 +0000 (+0200)
Subject: Issue 4063: Interpret < > and << >> in \chordmode
X-Git-Tag: release/2.19.13-1~35
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3399446a56b0832d5fa690146e4c9a953e635589;p=lilypond.git

Issue 4063: Interpret < > and << >> in \chordmode

There is no compelling reason not to do so, and having < > available
allows stuff like

\chordmode { \clef bass <c> c/e <g,> c/e }

or other ways of explicitly spelling out some not-really chord material.
---

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 8b0859630e..0c364c1bb2 100644
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -422,7 +422,7 @@ BOM_UTF8	\357\273\277
 		return token;
 }
 
-<INITIAL,notes,lyrics>{ 
+<INITIAL,notes,lyrics,chords>{
 	\<\<	{
                 yylval = SCM_UNSPECIFIED;
 		return DOUBLE_ANGLE_OPEN;
@@ -433,7 +433,7 @@ BOM_UTF8	\357\273\277
 	}
 }
 
-<INITIAL,notes>{
+<INITIAL,notes,chords>{
 	\<	{
                 yylval = SCM_UNSPECIFIED;
 		return ANGLE_OPEN;
diff --git a/lily/parser.yy b/lily/parser.yy
index c8365abf13..4a805f1970 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2656,7 +2656,7 @@ chord_body_elements:
 	;
 
 chord_body_element:
-	pitch exclamations questions octave_check post_events
+	pitch_or_tonic_pitch exclamations questions octave_check post_events
 	{
 		bool q = to_boolean ($3);
 		bool ex = to_boolean ($2);
@@ -2919,6 +2919,11 @@ pitch:
 	}
 	;
 
+pitch_or_tonic_pitch:
+	pitch
+	| steno_tonic_pitch
+	;
+
 gen_text_def:
 	full_markup {
 		Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);