-%token <scm> MUSIC_FUNCTION_MARKUP
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC
-
-%token DRUMS
-%token DRUMMODE
-
-
-%type <book> book_block book_body
-%type <i> bare_int bare_unsigned
-%type <i> exclamations questions dots optional_rest
-%type <i> script_dir
-%type <i> sub_quotes sup_quotes
-%type <i> tremolo_type
-%type <i> bass_mod
-
-%type <music> Composite_music Simple_music Prefix_composite_music Generic_prefix_music
-%type <music> Grouped_music_list
-%type <music> Music Sequential_music Simultaneous_music
-%type <music> Repeated_music
-%type <music> command_req
-%type <music> gen_text_def direction_less_event direction_reqd_event
-%type <music> music_property_def context_change
-%type <music> note_chord_element chord_body chord_body_element
-%type <music> post_event tagged_post_event
-%type <music> relative_music re_rhythmed_music
-%type <music> simple_element event_chord command_element
-%type <music> string_number_event
-%type <music> toplevel_music
-%type <music> tempo_event
-
-%type <outputdef> output_def_body output_def_head
-%type <outputdef> output_def paper_block
-
-%type <scm> assignment_id
-%type <scm> Music_list
-%type <scm> chord_body_elements
-%type <scm> chord_item chord_items chord_separator new_chord
-%type <scm> context_def_spec_block context_def_spec_body
-%type <scm> context_mod context_def_mod optional_context_mod
-%type <scm> context_prop_spec
-%type <scm> direction_less_char
-%type <scm> duration_length fraction
-%type <scm> embedded_scm scalar
-%type <scm> identifier_init
-%type <scm> lilypond_header lilypond_header_body
-%type <scm> new_lyrics
-%type <scm> post_events
-%type <scm> property_operation
-%type <scm> script_abbreviation
-%type <scm> simple_string
-%type <scm> steno_pitch pitch absolute_pitch pitch_also_in_chords
-%type <scm> steno_tonic_pitch
-%type <scm> step_number step_numbers
-%type <scm> string bare_number number_expression number_term number_factor
-%type <scm> bass_number br_bass_figure bass_figure figure_list figure_spec
-%type <scm> context_mod_list
-%type <scm> octave_check
-%type <scm> steno_duration optional_notemode_duration multiplied_duration
-%type <scm> Generic_prefix_music_scm
-%type <scm> lyric_element
-%type <scm> Alternative_music
-%type <scm> full_markup lyric_markup
-%type <scm> markup_list markup_composed_list markup_braced_list markup_braced_list_body
-%type <scm> markup_head_1_item markup_head_1_list markup simple_markup markup_top
-%type <scm> mode_changing_head
-%type <scm> mode_changing_head_with_context
-%type <scm> object_id_setting
-
-%type <score> score_block score_body
+%token <scm> MUSIC_IDENTIFIER
+%token <scm> NOTENAME_PITCH
+%token <scm> NUMBER_IDENTIFIER
+%token <scm> OUTPUT_DEF_IDENTIFIER
+%token <scm> REAL
+%token <scm> RESTNAME
+%token <scm> SCM_IDENTIFIER
+%token <scm> SCM_T
+%token <scm> SCORE_IDENTIFIER
+%token <scm> STRING
+%token <scm> STRING_IDENTIFIER
+%token <scm> TONICNAME_PITCH
+
+
+%type <book> book_block
+%type <book> book_body
+
+%type <i> bare_unsigned
+%type <i> bass_mod
+%type <i> dots
+%type <i> exclamations
+%type <i> optional_rest
+%type <i> questions
+%type <i> script_dir
+%type <i> sub_quotes
+%type <i> sup_quotes
+%type <i> tremolo_type
+
+%type <music> Composite_music
+%type <music> Generic_prefix_music
+%type <music> Grouped_music_list
+%type <music> Music
+%type <music> Prefix_composite_music
+%type <music> Repeated_music
+%type <music> Sequential_music
+%type <music> Simple_music
+%type <music> Simultaneous_music
+%type <music> chord_body
+%type <music> chord_body_element
+%type <music> command_element
+%type <music> command_req
+%type <music> context_change
+%type <music> direction_less_event
+%type <music> direction_reqd_event
+%type <music> event_chord
+%type <music> gen_text_def
+%type <music> music_property_def
+%type <music> note_chord_element
+%type <music> post_event
+%type <music> re_rhythmed_music
+%type <music> relative_music
+%type <music> simple_element
+%type <music> string_number_event
+%type <music> tagged_post_event
+%type <music> tempo_event
+%type <music> toplevel_music
+
+%type <outputdef> output_def_body
+%type <outputdef> output_def_head
+%type <outputdef> output_def
+%type <outputdef> paper_block
+
+%type <scm> Alternative_music
+%type <scm> Generic_prefix_music_scm
+%type <scm> Music_list
+%type <scm> absolute_pitch
+%type <scm> assignment_id
+%type <scm> bare_number
+%type <scm> bass_figure
+%type <scm> bass_number
+%type <scm> br_bass_figure
+%type <scm> chord_body_elements
+%type <scm> chord_item
+%type <scm> chord_items
+%type <scm> chord_separator
+%type <scm> context_def_mod
+%type <scm> context_def_spec_block
+%type <scm> context_def_spec_body
+%type <scm> context_mod
+%type <scm> context_mod_list
+%type <scm> context_prop_spec
+%type <scm> direction_less_char
+%type <scm> duration_length
+%type <scm> embedded_scm
+%type <scm> figure_list
+%type <scm> figure_spec
+%type <scm> fraction
+%type <scm> full_markup
+%type <scm> identifier_init
+%type <scm> lilypond_header
+%type <scm> lilypond_header_body
+%type <scm> lyric_element
+%type <scm> lyric_markup
+%type <scm> markup
+%type <scm> markup_braced_list
+%type <scm> markup_braced_list_body
+%type <scm> markup_composed_list
+%type <scm> markup_head_1_item
+%type <scm> markup_head_1_list
+%type <scm> markup_list
+%type <scm> markup_top
+%type <scm> mode_changing_head
+%type <scm> mode_changing_head_with_context
+%type <scm> multiplied_duration
+%type <scm> new_chord
+%type <scm> new_lyrics
+%type <scm> number_expression
+%type <scm> number_factor
+%type <scm> number_term
+%type <scm> object_id_setting
+%type <scm> octave_check
+%type <scm> optional_context_mod
+%type <scm> optional_notemode_duration
+%type <scm> pitch
+%type <scm> pitch_also_in_chords
+%type <scm> post_events
+%type <scm> property_operation
+%type <scm> scalar
+%type <scm> script_abbreviation
+%type <scm> simple_markup
+%type <scm> simple_string
+%type <scm> steno_duration
+%type <scm> steno_pitch
+%type <scm> steno_tonic_pitch
+%type <scm> step_number
+%type <scm> step_numbers
+%type <scm> string
+
+%type <score> score_block
+%type <score> score_body