X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fout%2Fparser.hh;fp=lily%2Fout%2Fparser.hh;h=122e9937a0cb95ea78572078360e5354d42a64c6;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=c90ff7ef2a6229280e80ff72858f40f0c3d3e7ca;hpb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;p=lilypond.git diff --git a/lily/out/parser.hh b/lily/out/parser.hh index c90ff7ef2a..122e9937a0 100644 --- a/lily/out/parser.hh +++ b/lily/out/parser.hh @@ -74,106 +74,95 @@ MIDI = 290, NAME = 291, NOTEMODE = 292, - OBJECTID = 293, - OCTAVE = 294, - ONCE = 295, - OVERRIDE = 296, - PAPER = 297, - PARTIAL = 298, - RELATIVE = 299, - REMOVE = 300, - REPEAT = 301, - REST = 302, - REVERT = 303, - SCORE = 304, - SEQUENTIAL = 305, - SET = 306, - SIMULTANEOUS = 307, - SKIP = 308, - TEMPO = 309, - TIMES = 310, - TRANSPOSE = 311, - TYPE = 312, - UNSET = 313, - WITH = 314, - TIME_T = 315, - NEWCONTEXT = 316, - CHORD_BASS = 317, - CHORD_CARET = 318, - CHORD_COLON = 319, - CHORD_MINUS = 320, - CHORD_SLASH = 321, - ANGLE_OPEN = 322, - ANGLE_CLOSE = 323, - DOUBLE_ANGLE_OPEN = 324, - DOUBLE_ANGLE_CLOSE = 325, - E_BACKSLASH = 326, - E_ANGLE_CLOSE = 327, - E_CHAR = 328, - E_CLOSE = 329, - E_EXCLAMATION = 330, - E_BRACKET_OPEN = 331, - E_OPEN = 332, - E_BRACKET_CLOSE = 333, - E_ANGLE_OPEN = 334, - E_PLUS = 335, - E_TILDE = 336, - EXTENDER = 337, - FIGURE_CLOSE = 338, - FIGURE_OPEN = 339, - FIGURE_SPACE = 340, - HYPHEN = 341, - CHORDMODIFIERS = 342, - LYRIC_MARKUP = 343, - MULTI_MEASURE_REST = 344, - DIGIT = 345, - E_UNSIGNED = 346, - UNSIGNED = 347, - EXPECT_MARKUP = 348, - EXPECT_MUSIC = 349, - EXPECT_SCM = 350, + OCTAVE = 293, + ONCE = 294, + OVERRIDE = 295, + PAPER = 296, + PARTIAL = 297, + RELATIVE = 298, + REMOVE = 299, + REPEAT = 300, + REST = 301, + REVERT = 302, + SCORE = 303, + SEQUENTIAL = 304, + SET = 305, + SIMULTANEOUS = 306, + SKIP = 307, + TEMPO = 308, + TIMES = 309, + TRANSPOSE = 310, + TYPE = 311, + UNSET = 312, + WITH = 313, + TIME_T = 314, + NEWCONTEXT = 315, + CHORD_BASS = 316, + CHORD_CARET = 317, + CHORD_COLON = 318, + CHORD_MINUS = 319, + CHORD_SLASH = 320, + ANGLE_OPEN = 321, + ANGLE_CLOSE = 322, + DOUBLE_ANGLE_OPEN = 323, + DOUBLE_ANGLE_CLOSE = 324, + E_BACKSLASH = 325, + E_ANGLE_CLOSE = 326, + E_CHAR = 327, + E_CLOSE = 328, + E_EXCLAMATION = 329, + E_BRACKET_OPEN = 330, + E_OPEN = 331, + E_BRACKET_CLOSE = 332, + E_ANGLE_OPEN = 333, + E_PLUS = 334, + E_TILDE = 335, + EXTENDER = 336, + FIGURE_CLOSE = 337, + FIGURE_OPEN = 338, + FIGURE_SPACE = 339, + HYPHEN = 340, + CHORDMODIFIERS = 341, + LYRIC_MARKUP = 342, + MULTI_MEASURE_REST = 343, + DIGIT = 344, + E_UNSIGNED = 345, + UNSIGNED = 346, + EXPECT_MARKUP = 347, + EXPECT_MUSIC = 348, + EXPECT_SCM = 349, + EXPECT_MARKUP_LIST = 350, EXPECT_NO_MORE_ARGS = 351, BOOK_IDENTIFIER = 352, CHORDMODIFIER_PITCH = 353, CHORD_MODIFIER = 354, - CONTEXT_DEF_IDENTIFIER = 355, - DRUM_PITCH = 356, - DURATION_IDENTIFIER = 357, - EVENT_IDENTIFIER = 358, - FRACTION = 359, - LYRICS_STRING = 360, - LYRIC_MARKUP_IDENTIFIER = 361, - MARKUP_HEAD_EMPTY = 362, - MARKUP_HEAD_LIST0 = 363, - MARKUP_HEAD_MARKUP0 = 364, - MARKUP_HEAD_MARKUP0_MARKUP1 = 365, - MARKUP_HEAD_SCM0 = 366, - MARKUP_HEAD_SCM0_MARKUP1 = 367, - MARKUP_HEAD_SCM0_SCM1 = 368, - MARKUP_HEAD_SCM0_SCM1_MARKUP2 = 369, - MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 = 370, - MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 = 371, - MARKUP_HEAD_SCM0_SCM1_SCM2 = 372, - MARKUP_LIST_HEAD_EMPTY = 373, - MARKUP_LIST_HEAD_LIST0 = 374, - MARKUP_LIST_HEAD_SCM0 = 375, - MARKUP_LIST_HEAD_SCM0_LIST1 = 376, - MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 = 377, - MARKUP_IDENTIFIER = 378, - MUSIC_FUNCTION = 379, - MUSIC_IDENTIFIER = 380, - NOTENAME_PITCH = 381, - NUMBER_IDENTIFIER = 382, - OUTPUT_DEF_IDENTIFIER = 383, - REAL = 384, - RESTNAME = 385, - SCM_IDENTIFIER = 386, - SCM_TOKEN = 387, - SCORE_IDENTIFIER = 388, - STRING = 389, - STRING_IDENTIFIER = 390, - TONICNAME_PITCH = 391, - UNARY_MINUS = 392 + CHORD_REPETITION = 355, + CONTEXT_DEF_IDENTIFIER = 356, + CONTEXT_MOD_IDENTIFIER = 357, + DRUM_PITCH = 358, + DURATION_IDENTIFIER = 359, + EVENT_IDENTIFIER = 360, + FRACTION = 361, + LYRICS_STRING = 362, + LYRIC_MARKUP_IDENTIFIER = 363, + MARKUP_FUNCTION = 364, + MARKUP_LIST_FUNCTION = 365, + MARKUP_IDENTIFIER = 366, + MARKUPLINES_IDENTIFIER = 367, + MUSIC_FUNCTION = 368, + MUSIC_IDENTIFIER = 369, + NOTENAME_PITCH = 370, + NUMBER_IDENTIFIER = 371, + OUTPUT_DEF_IDENTIFIER = 372, + REAL = 373, + RESTNAME = 374, + SCM_IDENTIFIER = 375, + SCM_TOKEN = 376, + SCORE_IDENTIFIER = 377, + STRING = 378, + STRING_IDENTIFIER = 379, + TONICNAME_PITCH = 380, + UNARY_MINUS = 381 }; #endif /* Tokens. */ @@ -212,113 +201,102 @@ #define MIDI 290 #define NAME 291 #define NOTEMODE 292 -#define OBJECTID 293 -#define OCTAVE 294 -#define ONCE 295 -#define OVERRIDE 296 -#define PAPER 297 -#define PARTIAL 298 -#define RELATIVE 299 -#define REMOVE 300 -#define REPEAT 301 -#define REST 302 -#define REVERT 303 -#define SCORE 304 -#define SEQUENTIAL 305 -#define SET 306 -#define SIMULTANEOUS 307 -#define SKIP 308 -#define TEMPO 309 -#define TIMES 310 -#define TRANSPOSE 311 -#define TYPE 312 -#define UNSET 313 -#define WITH 314 -#define TIME_T 315 -#define NEWCONTEXT 316 -#define CHORD_BASS 317 -#define CHORD_CARET 318 -#define CHORD_COLON 319 -#define CHORD_MINUS 320 -#define CHORD_SLASH 321 -#define ANGLE_OPEN 322 -#define ANGLE_CLOSE 323 -#define DOUBLE_ANGLE_OPEN 324 -#define DOUBLE_ANGLE_CLOSE 325 -#define E_BACKSLASH 326 -#define E_ANGLE_CLOSE 327 -#define E_CHAR 328 -#define E_CLOSE 329 -#define E_EXCLAMATION 330 -#define E_BRACKET_OPEN 331 -#define E_OPEN 332 -#define E_BRACKET_CLOSE 333 -#define E_ANGLE_OPEN 334 -#define E_PLUS 335 -#define E_TILDE 336 -#define EXTENDER 337 -#define FIGURE_CLOSE 338 -#define FIGURE_OPEN 339 -#define FIGURE_SPACE 340 -#define HYPHEN 341 -#define CHORDMODIFIERS 342 -#define LYRIC_MARKUP 343 -#define MULTI_MEASURE_REST 344 -#define DIGIT 345 -#define E_UNSIGNED 346 -#define UNSIGNED 347 -#define EXPECT_MARKUP 348 -#define EXPECT_MUSIC 349 -#define EXPECT_SCM 350 +#define OCTAVE 293 +#define ONCE 294 +#define OVERRIDE 295 +#define PAPER 296 +#define PARTIAL 297 +#define RELATIVE 298 +#define REMOVE 299 +#define REPEAT 300 +#define REST 301 +#define REVERT 302 +#define SCORE 303 +#define SEQUENTIAL 304 +#define SET 305 +#define SIMULTANEOUS 306 +#define SKIP 307 +#define TEMPO 308 +#define TIMES 309 +#define TRANSPOSE 310 +#define TYPE 311 +#define UNSET 312 +#define WITH 313 +#define TIME_T 314 +#define NEWCONTEXT 315 +#define CHORD_BASS 316 +#define CHORD_CARET 317 +#define CHORD_COLON 318 +#define CHORD_MINUS 319 +#define CHORD_SLASH 320 +#define ANGLE_OPEN 321 +#define ANGLE_CLOSE 322 +#define DOUBLE_ANGLE_OPEN 323 +#define DOUBLE_ANGLE_CLOSE 324 +#define E_BACKSLASH 325 +#define E_ANGLE_CLOSE 326 +#define E_CHAR 327 +#define E_CLOSE 328 +#define E_EXCLAMATION 329 +#define E_BRACKET_OPEN 330 +#define E_OPEN 331 +#define E_BRACKET_CLOSE 332 +#define E_ANGLE_OPEN 333 +#define E_PLUS 334 +#define E_TILDE 335 +#define EXTENDER 336 +#define FIGURE_CLOSE 337 +#define FIGURE_OPEN 338 +#define FIGURE_SPACE 339 +#define HYPHEN 340 +#define CHORDMODIFIERS 341 +#define LYRIC_MARKUP 342 +#define MULTI_MEASURE_REST 343 +#define DIGIT 344 +#define E_UNSIGNED 345 +#define UNSIGNED 346 +#define EXPECT_MARKUP 347 +#define EXPECT_MUSIC 348 +#define EXPECT_SCM 349 +#define EXPECT_MARKUP_LIST 350 #define EXPECT_NO_MORE_ARGS 351 #define BOOK_IDENTIFIER 352 #define CHORDMODIFIER_PITCH 353 #define CHORD_MODIFIER 354 -#define CONTEXT_DEF_IDENTIFIER 355 -#define DRUM_PITCH 356 -#define DURATION_IDENTIFIER 357 -#define EVENT_IDENTIFIER 358 -#define FRACTION 359 -#define LYRICS_STRING 360 -#define LYRIC_MARKUP_IDENTIFIER 361 -#define MARKUP_HEAD_EMPTY 362 -#define MARKUP_HEAD_LIST0 363 -#define MARKUP_HEAD_MARKUP0 364 -#define MARKUP_HEAD_MARKUP0_MARKUP1 365 -#define MARKUP_HEAD_SCM0 366 -#define MARKUP_HEAD_SCM0_MARKUP1 367 -#define MARKUP_HEAD_SCM0_SCM1 368 -#define MARKUP_HEAD_SCM0_SCM1_MARKUP2 369 -#define MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 370 -#define MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 371 -#define MARKUP_HEAD_SCM0_SCM1_SCM2 372 -#define MARKUP_LIST_HEAD_EMPTY 373 -#define MARKUP_LIST_HEAD_LIST0 374 -#define MARKUP_LIST_HEAD_SCM0 375 -#define MARKUP_LIST_HEAD_SCM0_LIST1 376 -#define MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 377 -#define MARKUP_IDENTIFIER 378 -#define MUSIC_FUNCTION 379 -#define MUSIC_IDENTIFIER 380 -#define NOTENAME_PITCH 381 -#define NUMBER_IDENTIFIER 382 -#define OUTPUT_DEF_IDENTIFIER 383 -#define REAL 384 -#define RESTNAME 385 -#define SCM_IDENTIFIER 386 -#define SCM_TOKEN 387 -#define SCORE_IDENTIFIER 388 -#define STRING 389 -#define STRING_IDENTIFIER 390 -#define TONICNAME_PITCH 391 -#define UNARY_MINUS 392 +#define CHORD_REPETITION 355 +#define CONTEXT_DEF_IDENTIFIER 356 +#define CONTEXT_MOD_IDENTIFIER 357 +#define DRUM_PITCH 358 +#define DURATION_IDENTIFIER 359 +#define EVENT_IDENTIFIER 360 +#define FRACTION 361 +#define LYRICS_STRING 362 +#define LYRIC_MARKUP_IDENTIFIER 363 +#define MARKUP_FUNCTION 364 +#define MARKUP_LIST_FUNCTION 365 +#define MARKUP_IDENTIFIER 366 +#define MARKUPLINES_IDENTIFIER 367 +#define MUSIC_FUNCTION 368 +#define MUSIC_IDENTIFIER 369 +#define NOTENAME_PITCH 370 +#define NUMBER_IDENTIFIER 371 +#define OUTPUT_DEF_IDENTIFIER 372 +#define REAL 373 +#define RESTNAME 374 +#define SCM_IDENTIFIER 375 +#define SCM_TOKEN 376 +#define SCORE_IDENTIFIER 377 +#define STRING 378 +#define STRING_IDENTIFIER 379 +#define TONICNAME_PITCH 380 +#define UNARY_MINUS 381 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 98 "/main/src/gub/target/linux-x86/src/lilypond-git.sv.gnu.org--lilypond.git-stable-2.12/lily/parser.yy" +#line 110 "/main/src/gub/target/linux-x86/src/lilypond-git.sv.gnu.org--lilypond.git-stable-2.14/lily/parser.yy" { Book *book; Output_def *outputdef; @@ -329,7 +307,7 @@ typedef union YYSTYPE int i; } /* Line 1489 of yacc.c. */ -#line 333 "out/parser.hh" +#line 311 "out/parser.hh" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1