add <> to catch-all string rule

diff --git a/ChangeLog b/ChangeLog
index 8a63e5638462bd1ceeb1c4edf176017f8eaebb7c..0f93a33cfdf0c72081fe1c7576708318c98c39c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/lexer.ll: add  <> to catch-all string rule
+
+2004-11-23  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/abc2ly.py: add ord() calls. 
+
 2004-12-03  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * cygwin/lily-wins.py (stat): remove old flag -p when calling lilypond.

diff --git a/VERSION b/VERSION
index 990a67f2415e8f82709788f5d6b90c7175f69b66..ca938d88696b8f61f123f1d8605617648fab4953 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=4
-PATCH_LEVEL=2
+PATCH_LEVEL=3
 MY_PATCH_LEVEL=
 

diff --git a/lily/include/guile-compatibility.hh b/lily/include/guile-compatibility.hh
index 13a160733c3661c695131ef1a644bc8ee62d3c91..a49f4fe5a69cfeffa7ddf0a28b2054fd7055a353 100644 (file)
--- a/lily/include/guile-compatibility.hh
+++ b/lily/include/guile-compatibility.hh
@@ -56,6 +56,7 @@ inline bool ly_c_eq_p (SCM x, SCM y) { return SCM_EQ_P (x, y); }
 #define scm_is_eq(x,y)  (SCM_EQ_P((x), (y)))
 
 #define scm_is_pair(x) (SCM_CONSP(x))
+#define scm_c_string_length(x) SCM_STRING_LENGTH(x)
 
 
 inline double ly_scm2double (SCM x) { return scm_num2dbl (x, "ly_scm2double"); }