From: David Kastrup Date: Mon, 11 Jun 2012 17:28:31 +0000 (+0200) Subject: Issue 2598: Allow brackets and parens to start lyrics, disallow "accents" X-Git-Tag: release/2.15.41-1~44 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bd0a3b9232483a34b47a2c24fbd835017e2be2ca;p=lilypond.git Issue 2598: Allow brackets and parens to start lyrics, disallow "accents" [] and () are considered as punctuation in lyrics and can start them. In contrast, "TeX accents" \' \" \` \^ are quite ridiculous to "support" in lyrics since LilyPond has not been using TeX for a long time now, so those sequences are no longer considered special in lyrics. --- diff --git a/lily/lexer.ll b/lily/lexer.ll index bdbf128314..a56c182eab 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -152,11 +152,10 @@ AA {A}|_ N [0-9] AN {AA}|{N} ANY_CHAR (.|\n) -PUNCT [?!:'`] -ACCENT \\[`'"^] +PUNCT [][()?!:'`] SPECIAL_CHAR [&@] NATIONAL [\001-\006\021-\027\031\036] -TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL}|{SPECIAL_CHAR} +TEX {AA}|-|{PUNCT}|{NATIONAL}|{SPECIAL_CHAR} DASHED_WORD {A}({AN}|-)* DASHED_KEY_WORD \\{DASHED_WORD}