programming_error messages should NOT be translated

[lilypond.git] / lily / parser.yy

diff --git a/lily/parser.yy b/lily/parser.yy
index c38a4a2d5b8517b1a690d28951828c2d84ea9ba5..02c99e2f42e8f4eb7cf3283a764369ccac3770d7 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -202,7 +202,6 @@ void set_music_properties (Music *p, SCM a);
 %token ONCE "\\once"
 %token OVERRIDE "\\override"
 %token PAPER "\\paper"
-%token PARTIAL "\\partial"
 %token RELATIVE "\\relative"
 %token REMOVE "\\remove"
 %token REPEAT "\\repeat"
@@ -212,7 +211,6 @@ void set_music_properties (Music *p, SCM a);
 %token SEQUENTIAL "\\sequential"
 %token SET "\\set"
 %token SIMULTANEOUS "\\simultaneous"
-%token SKIP "\\skip"
 %token TEMPO "\\tempo"
 %token TIMES "\\times"
 %token TYPE "\\type"
@@ -284,6 +282,7 @@ If we give names, Bison complains.
 %token <scm> CONTEXT_DEF_IDENTIFIER
 %token <scm> CONTEXT_MOD_IDENTIFIER
 %token <scm> DRUM_PITCH
+%token <scm> PITCH_IDENTIFIER
 %token <scm> DURATION_IDENTIFIER
 %token <scm> EVENT_IDENTIFIER
 %token <scm> FRACTION
@@ -1661,9 +1660,6 @@ command_element:
        command_event {
                $$ = $1;
        }
-       | SKIP duration_length {
-               $$ = MAKE_SYNTAX ("skip-music", @$, $2);
-       }
        | E_BRACKET_OPEN {
                Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
                m->set_property ("span-direction", scm_from_int (START));
@@ -1691,10 +1687,6 @@ command_element:
                        $$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
 
        }
-       | PARTIAL duration_length       {
-               $$ = MAKE_SYNTAX ("partial", @$, $2);
-       }
-
        | TIME_T fraction  {
                SCM proc = ly_lily_module_constant ("make-time-signature-set");
 
@@ -1945,6 +1937,7 @@ pitch:
        steno_pitch {
                $$ = $1;
        }
+       | PITCH_IDENTIFIER
        ;
 
 pitch_also_in_chords:
@@ -2006,7 +1999,7 @@ script_dir:
 
 
 absolute_pitch:
-       steno_pitch     {
+       pitch   {
                $$ = $1;
        }
        ;
@@ -2680,6 +2673,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 
                mus->unprotect ();
                return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+       } else if (unsmob_pitch (sid)) {
+               *destination = unsmob_pitch (sid)->smobbed_copy ();
+               return PITCH_IDENTIFIER;
        } else if (unsmob_duration (sid)) {
                *destination = unsmob_duration (sid)->smobbed_copy ();
                return DURATION_IDENTIFIER;