add <> to catch-all string rule

diff --git a/ChangeLog b/ChangeLog
index 0f93a33cfdf0c72081fe1c7576708318c98c39c3..cbf036cb4814782ce240e7377b16b82efa406cfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@
 
 2004-11-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 a1c7623703f107f67a50401d80efc87e186c89e6..98d77c065009e1eb1120b909cdd48e4ff1a7d5a5 100644 (file)
--- 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 68200e785e3769859068434d01f4c1af0cc25c4c..9cd88b27f869af53d0220a8b6625525e049ff03d 100644 (file)
--- 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)