-#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