(chord_inversion): use CHORD_SLASH for '/'

diff --git a/ChangeLog b/ChangeLog
index 9ec04b9e9885748820b6e2bb86e9c263619c0da0..91da130e10fa2bf3c6e9fe2c74778bcfb2ea34b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-06  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/parser.yy (chord_inversion): use CHORD_SLASH for '/'
+
 2002-09-06  Jérémie Lumbroso  <jeremie@lumbroso.fr>
 
        * Documentation/user/refman.itely: minor corrections (replacing

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 78b43638f2e5fb997be3b990025f45d7e4fccfb3..8413a0ce431eaadf483b693363df17b28f88eba5 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -398,6 +398,9 @@ HYPHEN              --
        \/\+ {
                return CHORD_BASS;
        }
+       \/  {
+               return CHORD_SLASH;
+       }
        \^  {
                return CHORD_CARET;
        }

diff --git a/lily/parser.yy b/lily/parser.yy
index eb01922e05b3d3b973a486e2ad53b3b34ff7e191..66b2e63568635d1b91480e75bb43ca339436786f 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -243,7 +243,7 @@ yylex (YYSTYPE *s,  void * v)
 %token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
 %token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE
 %token E_BACKSLASH
-%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET
+%token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET  CHORD_SLASH
 %token FIGURE_SPACE
 
 
@@ -310,6 +310,7 @@ yylex (YYSTYPE *s,  void * v)
 %type <music> command_req verbose_command_req
 %type <request>        extender_req
 %type <request> hyphen_req
+%type <request> string_request
 %type <scm>    string bare_number number_expression number_term number_factor 
 
 %type <score>  score_block score_body
@@ -1396,9 +1397,17 @@ post_request:
        verbose_request
        | request_with_dir
        | close_request
+       | string_request
        ;
 
 
+/*
+TODO.
+*/
+string_request:
+       '/' DIGIT  { $$ = new Text_script_req (); } 
+       ;
+
 request_that_take_dir:
        gen_text_def
        | verbose_request
@@ -2025,7 +2034,7 @@ chord_inversion:
        {
                $$ = SCM_EOL;
        }
-       | '/' steno_tonic_pitch {
+       | CHORD_SLASH steno_tonic_pitch {
                $$ = $2;
        }
        ;