X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fout%2Fparser.hh;h=365da7b6b982c894f49fd097e8aec3e3cc2eee02;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=122e9937a0cb95ea78572078360e5354d42a64c6;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/lily/out/parser.hh b/lily/out/parser.hh
index 122e9937a0..365da7b6b9 100644
--- a/lily/out/parser.hh
+++ b/lily/out/parser.hh
@@ -39,275 +39,272 @@
    /* Put the tokens into the symbol table, so that GDB and other debuggers
       know about them.  */
    enum yytokentype {
-     PREC_TOP = 258,
-     ADDLYRICS = 259,
-     PREC_BOT = 260,
-     ACCEPTS = 261,
-     ALIAS = 262,
-     ALTERNATIVE = 263,
-     BOOK = 264,
-     BOOKPART = 265,
-     CHANGE = 266,
-     CHORDMODE = 267,
-     CHORDS = 268,
-     CONSISTS = 269,
-     CONTEXT = 270,
-     DEFAULT = 271,
-     DEFAULTCHILD = 272,
-     DENIES = 273,
-     DESCRIPTION = 274,
-     DRUMMODE = 275,
-     DRUMS = 276,
-     FIGUREMODE = 277,
-     FIGURES = 278,
-     GROBDESCRIPTIONS = 279,
-     HEADER = 280,
-     INVALID = 281,
-     KEY = 282,
-     LAYOUT = 283,
-     LYRICMODE = 284,
-     LYRICS = 285,
-     LYRICSTO = 286,
-     MARK = 287,
-     MARKUP = 288,
-     MARKUPLINES = 289,
-     MIDI = 290,
-     NAME = 291,
-     NOTEMODE = 292,
-     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,
+     PREC_BOT = 258,
+     REPEAT = 259,
+     ALTERNATIVE = 260,
+     COMPOSITE = 261,
+     ADDLYRICS = 262,
+     DEFAULT = 263,
+     FUNCTION_ARGLIST = 264,
+     DURATION_IDENTIFIER = 265,
+     REAL = 266,
+     UNSIGNED = 267,
+     TONICNAME_PITCH = 268,
+     NOTENAME_PITCH = 269,
+     PITCH_IDENTIFIER = 270,
+     NUMBER_IDENTIFIER = 271,
+     PREC_TOP = 272,
+     ACCEPTS = 273,
+     ALIAS = 274,
+     BOOK = 275,
+     BOOKPART = 276,
+     CHANGE = 277,
+     CHORDMODE = 278,
+     CHORDS = 279,
+     CONSISTS = 280,
+     CONTEXT = 281,
+     DEFAULTCHILD = 282,
+     DENIES = 283,
+     DESCRIPTION = 284,
+     DRUMMODE = 285,
+     DRUMS = 286,
+     FIGUREMODE = 287,
+     FIGURES = 288,
+     HEADER = 289,
+     INVALID = 290,
+     LAYOUT = 291,
+     LYRICMODE = 292,
+     LYRICS = 293,
+     LYRICSTO = 294,
+     MARKUP = 295,
+     MARKUPLIST = 296,
+     MIDI = 297,
+     NAME = 298,
+     NOTEMODE = 299,
+     OVERRIDE = 300,
+     PAPER = 301,
+     REMOVE = 302,
+     REST = 303,
+     REVERT = 304,
+     SCORE = 305,
+     SEQUENTIAL = 306,
+     SET = 307,
+     SIMULTANEOUS = 308,
+     TEMPO = 309,
+     TYPE = 310,
+     UNSET = 311,
+     WITH = 312,
+     NEWCONTEXT = 313,
+     CHORD_BASS = 314,
+     CHORD_CARET = 315,
+     CHORD_COLON = 316,
+     CHORD_MINUS = 317,
+     CHORD_SLASH = 318,
+     ANGLE_OPEN = 319,
+     ANGLE_CLOSE = 320,
+     DOUBLE_ANGLE_OPEN = 321,
+     DOUBLE_ANGLE_CLOSE = 322,
+     E_BACKSLASH = 323,
+     E_ANGLE_CLOSE = 324,
+     E_CHAR = 325,
+     E_CLOSE = 326,
+     E_EXCLAMATION = 327,
+     E_BRACKET_OPEN = 328,
+     E_OPEN = 329,
+     E_BRACKET_CLOSE = 330,
+     E_ANGLE_OPEN = 331,
+     E_PLUS = 332,
+     E_TILDE = 333,
+     EXTENDER = 334,
+     FIGURE_CLOSE = 335,
+     FIGURE_OPEN = 336,
+     FIGURE_SPACE = 337,
+     HYPHEN = 338,
+     CHORDMODIFIERS = 339,
+     LYRIC_MARKUP = 340,
+     MULTI_MEASURE_REST = 341,
+     E_UNSIGNED = 342,
+     EXPECT_MARKUP = 343,
+     EXPECT_PITCH = 344,
+     EXPECT_DURATION = 345,
+     EXPECT_SCM = 346,
+     BACKUP = 347,
+     REPARSE = 348,
+     EXPECT_MARKUP_LIST = 349,
+     EXPECT_OPTIONAL = 350,
      EXPECT_NO_MORE_ARGS = 351,
-     BOOK_IDENTIFIER = 352,
-     CHORDMODIFIER_PITCH = 353,
-     CHORD_MODIFIER = 354,
-     CHORD_REPETITION = 355,
-     CONTEXT_DEF_IDENTIFIER = 356,
-     CONTEXT_MOD_IDENTIFIER = 357,
-     DRUM_PITCH = 358,
-     DURATION_IDENTIFIER = 359,
+     EMBEDDED_LILY = 352,
+     BOOK_IDENTIFIER = 353,
+     CHORDMODIFIER_PITCH = 354,
+     CHORD_MODIFIER = 355,
+     CHORD_REPETITION = 356,
+     CONTEXT_DEF_IDENTIFIER = 357,
+     CONTEXT_MOD_IDENTIFIER = 358,
+     DRUM_PITCH = 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,
+     EVENT_FUNCTION = 361,
+     FRACTION = 362,
+     LYRICS_STRING = 363,
+     LYRIC_ELEMENT = 364,
+     LYRIC_MARKUP_IDENTIFIER = 365,
+     MARKUP_FUNCTION = 366,
+     MARKUP_LIST_FUNCTION = 367,
+     MARKUP_IDENTIFIER = 368,
+     MARKUPLIST_IDENTIFIER = 369,
+     MUSIC_FUNCTION = 370,
+     MUSIC_IDENTIFIER = 371,
      OUTPUT_DEF_IDENTIFIER = 372,
-     REAL = 373,
-     RESTNAME = 374,
+     RESTNAME = 373,
+     SCM_FUNCTION = 374,
      SCM_IDENTIFIER = 375,
      SCM_TOKEN = 376,
      SCORE_IDENTIFIER = 377,
      STRING = 378,
      STRING_IDENTIFIER = 379,
-     TONICNAME_PITCH = 380,
-     UNARY_MINUS = 381
+     UNARY_MINUS = 380
    };
 #endif
 /* Tokens.  */
-#define PREC_TOP 258
-#define ADDLYRICS 259
-#define PREC_BOT 260
-#define ACCEPTS 261
-#define ALIAS 262
-#define ALTERNATIVE 263
-#define BOOK 264
-#define BOOKPART 265
-#define CHANGE 266
-#define CHORDMODE 267
-#define CHORDS 268
-#define CONSISTS 269
-#define CONTEXT 270
-#define DEFAULT 271
-#define DEFAULTCHILD 272
-#define DENIES 273
-#define DESCRIPTION 274
-#define DRUMMODE 275
-#define DRUMS 276
-#define FIGUREMODE 277
-#define FIGURES 278
-#define GROBDESCRIPTIONS 279
-#define HEADER 280
-#define INVALID 281
-#define KEY 282
-#define LAYOUT 283
-#define LYRICMODE 284
-#define LYRICS 285
-#define LYRICSTO 286
-#define MARK 287
-#define MARKUP 288
-#define MARKUPLINES 289
-#define MIDI 290
-#define NAME 291
-#define NOTEMODE 292
-#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 PREC_BOT 258
+#define REPEAT 259
+#define ALTERNATIVE 260
+#define COMPOSITE 261
+#define ADDLYRICS 262
+#define DEFAULT 263
+#define FUNCTION_ARGLIST 264
+#define DURATION_IDENTIFIER 265
+#define REAL 266
+#define UNSIGNED 267
+#define TONICNAME_PITCH 268
+#define NOTENAME_PITCH 269
+#define PITCH_IDENTIFIER 270
+#define NUMBER_IDENTIFIER 271
+#define PREC_TOP 272
+#define ACCEPTS 273
+#define ALIAS 274
+#define BOOK 275
+#define BOOKPART 276
+#define CHANGE 277
+#define CHORDMODE 278
+#define CHORDS 279
+#define CONSISTS 280
+#define CONTEXT 281
+#define DEFAULTCHILD 282
+#define DENIES 283
+#define DESCRIPTION 284
+#define DRUMMODE 285
+#define DRUMS 286
+#define FIGUREMODE 287
+#define FIGURES 288
+#define HEADER 289
+#define INVALID 290
+#define LAYOUT 291
+#define LYRICMODE 292
+#define LYRICS 293
+#define LYRICSTO 294
+#define MARKUP 295
+#define MARKUPLIST 296
+#define MIDI 297
+#define NAME 298
+#define NOTEMODE 299
+#define OVERRIDE 300
+#define PAPER 301
+#define REMOVE 302
+#define REST 303
+#define REVERT 304
+#define SCORE 305
+#define SEQUENTIAL 306
+#define SET 307
+#define SIMULTANEOUS 308
+#define TEMPO 309
+#define TYPE 310
+#define UNSET 311
+#define WITH 312
+#define NEWCONTEXT 313
+#define CHORD_BASS 314
+#define CHORD_CARET 315
+#define CHORD_COLON 316
+#define CHORD_MINUS 317
+#define CHORD_SLASH 318
+#define ANGLE_OPEN 319
+#define ANGLE_CLOSE 320
+#define DOUBLE_ANGLE_OPEN 321
+#define DOUBLE_ANGLE_CLOSE 322
+#define E_BACKSLASH 323
+#define E_ANGLE_CLOSE 324
+#define E_CHAR 325
+#define E_CLOSE 326
+#define E_EXCLAMATION 327
+#define E_BRACKET_OPEN 328
+#define E_OPEN 329
+#define E_BRACKET_CLOSE 330
+#define E_ANGLE_OPEN 331
+#define E_PLUS 332
+#define E_TILDE 333
+#define EXTENDER 334
+#define FIGURE_CLOSE 335
+#define FIGURE_OPEN 336
+#define FIGURE_SPACE 337
+#define HYPHEN 338
+#define CHORDMODIFIERS 339
+#define LYRIC_MARKUP 340
+#define MULTI_MEASURE_REST 341
+#define E_UNSIGNED 342
+#define EXPECT_MARKUP 343
+#define EXPECT_PITCH 344
+#define EXPECT_DURATION 345
+#define EXPECT_SCM 346
+#define BACKUP 347
+#define REPARSE 348
+#define EXPECT_MARKUP_LIST 349
+#define EXPECT_OPTIONAL 350
 #define EXPECT_NO_MORE_ARGS 351
-#define BOOK_IDENTIFIER 352
-#define CHORDMODIFIER_PITCH 353
-#define CHORD_MODIFIER 354
-#define CHORD_REPETITION 355
-#define CONTEXT_DEF_IDENTIFIER 356
-#define CONTEXT_MOD_IDENTIFIER 357
-#define DRUM_PITCH 358
-#define DURATION_IDENTIFIER 359
+#define EMBEDDED_LILY 352
+#define BOOK_IDENTIFIER 353
+#define CHORDMODIFIER_PITCH 354
+#define CHORD_MODIFIER 355
+#define CHORD_REPETITION 356
+#define CONTEXT_DEF_IDENTIFIER 357
+#define CONTEXT_MOD_IDENTIFIER 358
+#define DRUM_PITCH 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 EVENT_FUNCTION 361
+#define FRACTION 362
+#define LYRICS_STRING 363
+#define LYRIC_ELEMENT 364
+#define LYRIC_MARKUP_IDENTIFIER 365
+#define MARKUP_FUNCTION 366
+#define MARKUP_LIST_FUNCTION 367
+#define MARKUP_IDENTIFIER 368
+#define MARKUPLIST_IDENTIFIER 369
+#define MUSIC_FUNCTION 370
+#define MUSIC_IDENTIFIER 371
 #define OUTPUT_DEF_IDENTIFIER 372
-#define REAL 373
-#define RESTNAME 374
+#define RESTNAME 373
+#define SCM_FUNCTION 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
+#define UNARY_MINUS 380
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 110 "/main/src/gub/target/linux-x86/src/lilypond-git.sv.gnu.org--lilypond.git-stable-2.14/lily/parser.yy"
+#line 182 "/main/src/gub/target/linux-x86/src/lilypond-git.sv.gnu.org--lilypond.git-stable-2.16/lily/parser.yy"
 {
 	Book *book;
 	Output_def *outputdef;
 	SCM scm;
 	std::string *string;
- 	Music *music;
  	Score *score;
  	int i;
 }
 /* Line 1489 of yacc.c.  */
-#line 311 "out/parser.hh"
+#line 308 "out/parser-tmp.hh"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1