From e7681d758af97739bbeb0faa89d170efe4dfe289 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 3 Dec 2004 17:52:05 +0000 Subject: [PATCH] add <> to catch-all string rule --- ChangeLog | 2 ++ lily/lexer.ll | 2 +- scripts/abc2ly.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0f93a33cfd..cbf036cb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,8 @@ 2004-11-20 Han-Wen Nienhuys + * VERSION: release 2.5.3 + * scm/define-markup-commands.scm (fill-line): use stack-stencils iso. stack-stencils-line. Fixes putting centered objects into fill-line. diff --git a/lily/lexer.ll b/lily/lexer.ll index a1c7623703..98d77c0650 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -530,7 +530,7 @@ HYPHEN -- [{}] { return YYText ()[0]; } - [^#{}"\\ \t\n\r\f]+ { + [^<>#{}"\\ \t\n\r\f]+ { String s (YYText ()); char c = s[s.length () - 1]; diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 68200e785e..9cd88b27f8 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -204,7 +204,7 @@ def dump_slyrics (outf): ks.sort () for k in ks: if re.match('[1-9]', k): - m = chr(string.atoi(k) + 'A') + m = chr(string.atoi(k) + ord ('A')) else: m = k for i in range (len(slyrics[voice_idx_dict[k]])): @@ -219,7 +219,7 @@ def dump_voices (outf): ks.sort () for k in ks: if re.match ('[1-9]', k): - m = chr(string.atoi(k) + 'A') + m = chr(string.atoi(k) + ord ('A')) else: m = k outf.write ("\nvoice%s = {" % m) -- 2.39.5