patch::: 1.3.39.jcn1

2000-03-24    <janneke@gnu.org>

* lily/lexer.ll (My_lily_lexer): Bugfix: lookup chordmodifiers in the
	chord-modifier table (not in the pitch list).

diff --git a/CHANGES b/CHANGES
index ef5ace978274d2565c81c2302b8934bdef22fa72..3e8e0221eedb7f1644172eb528357bf42c31f9b4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+2000-03-24    <janneke@gnu.org>
+
+* lily/lexer.ll (My_lily_lexer): Bugfix: lookup chordmodifiers in the
+       chord-modifier table (not in the pitch list).
+
 1.3.38.hwn2
 ===========
 

diff --git a/VERSION b/VERSION
index 0a4d16c5791456e96f02d9e237a1e916a0970f45..477b9587de61a97ad2a9a9ccbc5cd6047f405b49 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=39
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/lexer.ll b/lily/lexer.ll
index b567746c3667af61fe8be53ffa06bb3881ea4d88..cbe754c5c38ea7518cc8e29e52a07dba6fd9c3a0 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -511,7 +511,7 @@ My_lily_lexer::scan_bare_word (String str)
                    yylval.pitch->set_spot (Input (source_file_l (), 
                      here_ch_C ()));
                     return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-               } else if ((pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F)
+               } else if ((pitch = scm_hashq_ref (chordmodifier_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F)
                {
                    yylval.pitch = new Musical_pitch (pitch);
                    yylval.pitch->set_spot (Input (source_file_l (),