*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 1dfb760e50897556d46f9b7024e60876f2df64d1..7a7c2ec4db97e1f71557c3e445411854fd23aa00 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-07-17  Han-Wen  <hanwen@cs.uu.nl>
 
+       * GNUmakefile.in: distribute lexer-gcc-3.1.sh  as well
+       
        * lily/music.cc (LY_DEFINE): change ly-set-mus-property to
        ly-set-mus-property!
 
@@ -26,9 +28,6 @@
        * lily/rest.cc (after_line_breaking): only translate the whole
        rest if we have more than 1 staff line
 
-       * lily/parser.yy (property_def): only allow #Scheme as \property
-       argument.
-
 2002-07-16  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION: release 1.5.68

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 1db4a343c1ad39161a6b2e22a5cebf58691ab2d8..cfb286017000deda3db7fafc44f9891ff61a7367 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -19,7 +19,7 @@ SCRIPTS = configure aclocal.m4 autogen.sh
 README_FILES =  ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP
 README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt
 IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh 
 NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
 INSTALLATION_DIR=$(datadir)
 INSTALLATION_FILES=$(configuration) VERSION

diff --git a/VERSION b/VERSION
index 2e13323a11857090880ccd319e5e7f9033c82e0b..cb5cbc16b53ddbdd4379cdac27126561e6da137e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=68
-MY_PATCH_LEVEL=tca2
+MY_PATCH_LEVEL=uu1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/parser.yy b/lily/parser.yy
index f0aa450c826b0e80bb1a62b5779b3affefe2a7ad..9a352e06e868363af38fd90f16c00c8a83d4becd 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -301,7 +301,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <scm>    chord_note chord_inversion chord_bass
 %type <scm>    duration_length fraction
 
-%type <scm>  embedded_scm 
+%type <scm>  embedded_scm scalar
 %type <music>  Music Sequential_music Simultaneous_music 
 %type <music>  relative_music re_rhythmed_music part_combined_music
 %type <music>  property_def translator_change
@@ -1038,7 +1038,7 @@ translator_change:
        ;
 
 property_def:
-       PROPERTY STRING '.' STRING '='  embedded_scm {
+       PROPERTY STRING '.' STRING '='  scalar {
                
                Music *t = set_property_music (scm_string_to_symbol ($4), $6);
                Context_specced_music *csm = new Context_specced_music (SCM_EOL);
@@ -1117,6 +1117,14 @@ property_def:
        }
        ;
 
+
+scalar:
+        string          { $$ = $1; }
+        | bare_int      { $$ = gh_int2scm ($1); }
+        | embedded_scm  { $$ = $1; }
+        ;
+
+
 request_chord:
        pre_requests {
                THIS->push_spot ();