release: 1.5.35

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 2bbf7c564c076fbfa1a0b3543ab6ab56a2212433..7bff8df6f4b16026132d488f5d397afcd9e29e86 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -269,6 +269,15 @@ HYPHEN             --
        return SCM_T;
 }
 <figures>{
+       _       {
+               return FIGURE_SPACE;
+       }
+       \]      {
+               return FIGURE_BRACKET_CLOSE;
+       }
+       \[      {
+               return FIGURE_BRACKET_OPEN;
+       }
        \>              {
                return FIGURE_CLOSE;
        }
@@ -457,6 +466,10 @@ HYPHEN             --
        return E_OPEN;
     case ')':
        return E_CLOSE;
+    case '~':
+       return E_TILDE;
+    case '\\':
+       return E_BACKSLASH;
     default:
        return E_CHAR;
     }
@@ -545,7 +558,7 @@ My_lily_lexer::scan_escaped_word (String str)
                
                if (gh_pair_p (pitch))
                {
-                       yylval.scm = gh_cdr (pitch);
+                       yylval.scm = ly_cdr (pitch);
                        return NOTENAME_PITCH;
                }
        }
@@ -564,11 +577,11 @@ My_lily_lexer::scan_bare_word (String str)
        if ((YYSTATE == notes) || (YYSTATE == chords)) {
                SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
                if (gh_pair_p (pitch)) {
-                   yylval.scm = gh_cdr (pitch);
+                   yylval.scm = ly_cdr (pitch);
                     return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
                } else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
                {
-                   yylval.scm = gh_cdr (pitch);
+                   yylval.scm = ly_cdr (pitch);
                    return CHORDMODIFIER_PITCH;
                }
        }