]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/parser.yy
* lily/include/my-lily-parser.hh: rename My_lily -> Lily
[lilypond.git] / lily / parser.yy
index b4a509c615f1c9589d4725f4873926a08aa7f458..2188cd934ddde3fc3f22e638dfba2632cd7c656e 100644 (file)
@@ -26,6 +26,7 @@ TODO:
 
 
 #include "book.hh"
+
 #include "context-def.hh"
 #include "dimensions.hh"
 #include "event.hh"
@@ -36,14 +37,13 @@ TODO:
 #include "lilypond-input-version.hh"
 #include "ly-module.hh"
 #include "main.hh"
-#include "midi-def.hh"
 #include "misc.hh"
 #include "music-list.hh"
 #include "music-sequence.hh"
 #include "my-lily-lexer.hh"
 #include "my-lily-parser.hh"
 #include "paper-book.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "scm-hash.hh"
 #include "scm-option.hh"
 #include "score.hh"
@@ -61,7 +61,7 @@ SCM get_next_unique_context ();
 #define YYPARSE_PARAM my_lily_parser
 #define YYLEX_PARAM my_lily_parser
 #define THIS\
-       ((My_lily_parser *) my_lily_parser)
+       ((Lily_parser *) my_lily_parser)
 
 #define yyerror THIS->parser_error
 
@@ -81,8 +81,6 @@ tag_music (Music *m, SCM tag, Input ip)
        m->set_property ("tags", tags);
 }
 
-
-
 bool
 is_regular_identifier (SCM id)
 {
@@ -191,10 +189,11 @@ make_lyric_combine_music (SCM name, Music *music)
 deleting them.  Let's hope that a stack overflow doesnt trigger a move
 of the parse stack onto the heap. */
 
+%left NEWLYRICS
 
 %union {
        Book *book;
-       Music_output_def *outputdef;
+       Output_def *outputdef;
        SCM scm;
        String *string;
        Music *music;
@@ -206,8 +205,8 @@ of the parse stack onto the heap. */
 int
 yylex (YYSTYPE *s, void *v)
 {
-       My_lily_parser *pars = (My_lily_parser*) v;
-       My_lily_lexer *lex = pars->lexer_;
+       Lily_parser *pars = (Lily_parser*) v;
+       Lily_lexer *lex = pars->lexer_;
 
        lex->lexval = (void*) s;
        lex->prepare_for_next_token ();
@@ -224,8 +223,13 @@ yylex (YYSTYPE *s, void *v)
 
 2. \markup identifier.
 
+  (what? --hwn)
+
 3. \markup { }
 
+  (what? --hwn)
+
+
 4.  \repeat
        \repeat .. \alternative
 
@@ -243,45 +247,34 @@ or
 %pure_parser
 
 %token ACCEPTS
-%token ADDLYRICS
 %token ADDQUOTE
 %token LYRICSTO
 %token ALIAS
 %token ALTERNATIVE
-%token APPLY
-%token APPLYCONTEXT
-%token APPLYOUTPUT
-%token AUTOCHANGE
 %token BAR
 %token BOOK
-%token BREATHE
+%token BOOKPAPER
 %token CHANGE
 %token CHORDMODIFIERS
 %token CHORDS
-%token LESSLESS
-%token MOREMORE
+%token DOUBLE_ANGLE_OPEN
+%token DOUBLE_ANGLE_CLOSE
 %token CLEF
 %token COMMANDSPANREQUEST
 %token CONSISTS
-%token CONSISTSEND
 %token CONTEXT
 %token DEFAULT
 %token DENIES
 %token DESCRIPTION
-%token EOI
 %token EXTENDER
 %token FIGURES FIGURE_OPEN FIGURE_CLOSE
 %token FIGURE_BRACKET_CLOSE FIGURE_BRACKET_OPEN
-%token GRACE
-%token ACCIACCATURA
-%token APPOGGIATURA
 %token GROBDESCRIPTIONS
 %token HEADER
 %token HYPHEN
 %token INVALID
 %token KEY
 %token LYRICS
-%token LYRICS_STRING
 %token MARK
 %token MIDI
 %token MULTI_MEASURE_REST
@@ -292,7 +285,6 @@ or
 %token ONCE
 %token OVERRIDE SET REVERT
 %token PAPER
-%token PARTCOMBINE
 %token PARTIAL
 %token QUOTE
 %token RELATIVE
@@ -302,6 +294,7 @@ or
 %token SCM_T
 %token SCORE
 %token SEQUENTIAL
+%token NEWLYRICS
 %token SIMULTANEOUS
 %token SKIP
 %token SPANREQUEST
@@ -314,103 +307,120 @@ or
 %token TYPE
 %token UNSET
 %token WITH
+%token MARKUP
 
 /* escaped */
+/* FIXME: this sucks.  The user will get to see these names:
+    syntax error, unexpected E_CHAR:
+               \
+                 %%
+  */
+
 %token E_CHAR E_EXCLAMATION E_SMALLER E_BIGGER E_OPEN E_CLOSE
 %token E_LEFTSQUARE E_RIGHTSQUARE E_TILDE
 %token E_BACKSLASH
-%token <i> E_UNSIGNED
 %token CHORD_BASS CHORD_COLON CHORD_MINUS CHORD_CARET  CHORD_SLASH
 %token FIGURE_SPACE
 
-%type <book>   book_block book_body
-%type <i>      exclamations questions dots optional_rest
-%type <i>       bass_mod
-%type <scm>    grace_head
-%type <scm>    oct_check
-%type <scm>    context_mod_list
-%type <scm>    lyric_element
-%type <scm>    bass_number br_bass_figure bass_figure figure_list figure_spec
 %token <i>     DIGIT
-%token <scm>   NOTENAME_PITCH
-%token <scm>   TONICNAME_PITCH
-%token <scm>   CHORDMODIFIER_PITCH
-%token <scm>   DURATION_IDENTIFIER
-%token <scm>    FRACTION
+%token <i>     UNSIGNED
+%token <i> E_UNSIGNED
 %token <id>    IDENTIFIER
-%token DRUMS
+%token <scm>   CHORDMODIFIER_PITCH
 %token <scm>   DRUM_PITCH
-%token <scm>   CHORD_MODIFIER
-%token <scm>   SCORE_IDENTIFIER
-%token <scm>   MUSIC_OUTPUT_DEF_IDENTIFIER
-%token <scm>   NUMBER_IDENTIFIER
+%token <scm>   DURATION_IDENTIFIER
 %token <scm>   EVENT_IDENTIFIER
 %token <scm>   MUSIC_IDENTIFIER CONTEXT_DEF_IDENTIFIER
-%token <scm>   STRING_IDENTIFIER SCM_IDENTIFIER
+%token <scm>   NOTENAME_PITCH
+%token <scm>   NUMBER_IDENTIFIER
+%token <scm>   OUTPUT_DEF_IDENTIFIER
 %token <scm>   RESTNAME
-%token <scm>   STRING
+%token <scm> LYRICS_STRING
 %token <scm>   SCM_T
-%token <i>     UNSIGNED
+%token <scm>   SCORE_IDENTIFIER
+%token <scm>   STRING
+%token <scm>   STRING_IDENTIFIER SCM_IDENTIFIER
+%token <scm>   TONICNAME_PITCH
+%token <scm>   CHORD_MODIFIER
+%token <scm>    FRACTION
 %token <scm>   REAL
-
-%token MARKUP
-%token <scm> MARKUP_HEAD_MARKUP0
 %token <scm> MARKUP_HEAD_EMPTY
+%token <scm> MARKUP_HEAD_MARKUP0
 %token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
 %token <scm> MARKUP_HEAD_SCM0
 %token <scm> MARKUP_HEAD_SCM0_MARKUP1
 %token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
 %token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-
+%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
 %token <scm> MARKUP_IDENTIFIER MARKUP_HEAD_LIST0
-%type <scm> markup markup_line markup_list  markup_list_body full_markup
+%token <scm> MUSIC_FUNCTION
+%token <scm> MUSIC_FUNCTION_MUSIC 
+%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC 
+%token <scm> MUSIC_FUNCTION_SCM 
+%token <scm> MUSIC_FUNCTION_SCM_SCM 
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC 
+%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC 
+%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC 
+%token DRUMS
 
-%type <outputdef> output_def
-%type <scm>    lilypond_header lilypond_header_body
-%type <music>  open_event close_event
-%type <i>      sub_quotes sup_quotes
-%type <music>  toplevel_music
-%type <music>  simple_element event_chord command_element
-%type <music>  Composite_music Simple_music
-%type <music>  Repeated_music
-%type <scm>     Alternative_music
-%type <i>      tremolo_type
-%type <i>      bare_int  bare_unsigned
-%type <i>      script_dir
-%type <scm>    identifier_init
-%type <scm>    simple_string
 
-%type <music> note_chord_element chord_body chord_body_element
-%type <scm>  chord_body_elements
-%type <scm> steno_duration optional_notemode_duration multiplied_duration
-       
-%type <scm>   post_events
-%type <music> gen_text_def direction_less_event direction_reqd_event
-%type <scm>   steno_pitch pitch absolute_pitch pitch_also_in_chords
-%type <scm>    steno_tonic_pitch
-%type <scm>    duration_length fraction
 
-%type <scm> new_chord step_number chord_items chord_item chord_separator step_numbers
+%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 <scm>  embedded_scm scalar
+%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>  relative_music re_rhythmed_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 <scm> context_prop_spec
-%type <scm> Music_list
-%type <scm> property_operation context_mod context_def_mod optional_context_mod
-%type <outputdef>  music_output_def_body music_output_def_head
+%type <music>  note_chord_element chord_body chord_body_element
+%type <music>  open_event close_event
 %type <music>  post_event tagged_post_event
-%type <music> command_req
-%type <music> string_number_event
-%type <scm>    string bare_number number_expression number_term number_factor
-%type <score>  score_block score_body
+%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 book_paper_block 
+
+%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 <music>  tempo_event
+%type <scm>    context_mod context_def_mod optional_context_mod
+%type <scm>    context_prop_spec
+%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>    markup markup_line markup_list markup_list_body full_markup
 
+%type <score>  score_block score_body
 
 
 %left '-' '+'
@@ -423,9 +433,10 @@ prec levels in different prods */
 %%
 
 lilypond:      /* empty */
-       | lilypond EOI
-       | lilypond toplevel_expression {}
-       | lilypond assignment  { }
+       | lilypond toplevel_expression {
+       }
+       | lilypond assignment {
+       }
        | lilypond error {
                THIS->error_level_ = 1;
        }
@@ -436,93 +447,43 @@ lilypond: /* empty */
 
 toplevel_expression:
        lilypond_header {
-               THIS->header_ = $1;
-       }
-       | toplevel_music EOI {
-               Score *score = new Score;
-               SCM s = $1->self_scm ();
-
-               /* URG? */
-               SCM check_funcs
-                       = ly_scheme_function ("toplevel-music-functions");
-               for (; ly_c_pair_p (check_funcs);
-                      check_funcs = ly_cdr (check_funcs))
-                       s = scm_call_1 (ly_car (check_funcs), s);
-               score->music_ = s;
-
-               Book *book = new Book;
-               book->scores_.push (score);
-
-               scm_gc_unprotect_object (score->self_scm ());
-               
-               SCM header = THIS->header_;
-               Path outname = split_path (THIS->output_basename_);
-               int *c = &THIS->book_count_;
-               if (*c)
-                       outname.base += "-" + to_string (*c);
-               (*c)++;
-               Music_output_def *dp = unsmob_music_output_def
-                       (THIS->lexer_->lookup_identifier ("$defaultpaper"));
-               book->process (outname.to_string (),
-                       dp ? dp->clone () : new Paper_def, header);
-               scm_gc_unprotect_object (book->self_scm ());
+               THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
        }
        | add_quote {
        
        }
        | book_block {
                Book *book = $1;
-               SCM header = THIS->header_;
-               Path outname = split_path (THIS->output_basename_);
-               int *c = &THIS->book_count_;
-               if (*c)
-                       outname.base += "-" + to_string (*c);
-               (*c)++;
-               Music_output_def *dp = unsmob_music_output_def
-                       (THIS->lexer_->lookup_identifier ("$defaultpaper"));
-               book->process (outname.to_string (),
-                       dp ? dp->clone () : new Paper_def, header);
+               SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler");
+               scm_call_2 (proc, THIS->self_scm (), book->self_scm ());
                scm_gc_unprotect_object (book->self_scm ());
        }
        | score_block {
-               /* TODO: implicit book, depending on --no-book/--no-page-layout
-                  option? */
                Score *score = $1;
-               SCM head = is_module (score->header_) ? score->header_
-                       : THIS->header_.to_SCM ();
-
-               Path p = split_path (THIS->output_basename_);
-               int *c = &THIS->score_count_;
-               if (*c)
-                       p.base += "-" + to_string (*c);
-
-               (*c)++;
-               SCM outname = scm_makfrom0str (p.to_string ().to_str0());
-
-               for (int i = 0; i < score->defs_.size (); i++)
-                       default_rendering (score->music_,
-                                          score->defs_[i]->self_scm (), head,
-                                          outname);
-
-               if (score->defs_.is_empty ())
-               {
-                  Music_output_def *id = unsmob_music_output_def
-                       (THIS->lexer_->lookup_identifier ("$defaultpaper"));
-                  id = id ? id->clone () : new Paper_def;
-                  default_rendering (score->music_, id->self_scm (), head,
-                       outname);
-                  scm_gc_unprotect_object (id->self_scm ());
-               }
+               
+               SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler");
+               scm_call_2 (proc, THIS->self_scm (), score->self_scm ());
                scm_gc_unprotect_object (score->self_scm ());
        }
+       | toplevel_music {
+               Music *music = $1;
+               SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler");
+               scm_call_2 (proc, THIS->self_scm (), music->self_scm ());
+               scm_gc_unprotect_object (music->self_scm ());
+       }
        | output_def {
                SCM id = SCM_EOL;
-               if (dynamic_cast<Paper_def*> ($1))
-                       id = scm_makfrom0str ("$defaultpaper");
-               else if (dynamic_cast<Midi_def*> ($1))
-                       id = scm_makfrom0str ("$defaultmidi");
-               THIS->lexer_->set_identifier (id, $1->self_scm ());
-               scm_gc_unprotect_object ($1->self_scm ());
+               Output_def * od = $1;
+
+               if ($1->c_variable ("is-paper") == SCM_BOOL_T)
+                       id = ly_symbol2scm ("$defaultpaper");
+               else if ($1->c_variable ("is-midi") == SCM_BOOL_T)
+                       id = ly_symbol2scm ("$defaultmidi");
+               else if ($1->c_variable ("is-bookpaper") == SCM_BOOL_T)
+                       id = ly_symbol2scm ("$defaultbookpaper");
+
+               THIS->lexer_->set_identifier (id, od->self_scm ());
+               scm_gc_unprotect_object (od->self_scm ());
        }
        ;
 
@@ -539,7 +500,7 @@ embedded_scm:
 
 lilypond_header_body:
        {
-               $$ = ly_make_anonymous_module ();
+               $$ = ly_make_anonymous_module (safe_global_b);
                THIS->lexer_->add_scope ($$);
        }
        | lilypond_header_body assignment  {
@@ -592,9 +553,6 @@ identifier_init:
                $$ = $1->self_scm ();
                scm_gc_unprotect_object ($$);
        }
-       | full_markup {
-               $$ = $1;
-       }
        | output_def {
                $$ = $1->self_scm ();
                scm_gc_unprotect_object ($$);
@@ -611,14 +569,20 @@ identifier_init:
                scm_gc_unprotect_object ($$);
        }
        | number_expression {
-               $$ = $1;
+               $$ = $1;
        }
        | string {
                $$ = $1;
        }
-       | embedded_scm  {
+        | embedded_scm {
+               $$ = $1;
+       }
+       | full_markup {
                $$ = $1;
        }
+       | DIGIT {
+               $$ = scm_int2num ($1);
+       }
        ;
 
 context_def_spec_block:
@@ -633,7 +597,7 @@ context_def_spec_body:
                $$ = Context_def::make_scm ();
                unsmob_context_def ($$)->set_spot (THIS->here_input ());
        }
-       | CONTEXT_DEF_IDENTIFIER        {
+       | CONTEXT_DEF_IDENTIFIER {
                $$ = $1;
                unsmob_context_def ($$)->set_spot (THIS->here_input ());
        }
@@ -653,6 +617,8 @@ context_def_spec_body:
        }
        ;
 
+
+
 book_block:
        BOOK {
                THIS->push_spot ();
@@ -663,16 +629,38 @@ book_block:
        }
        ;
 
+/* FIXME:
+   * Use 'handlers' like for toplevel-* stuff?
+   * grok \paper and \midi?  */
 book_body:
        {
                $$ = new Book;
                $$->set_spot (THIS->here_input ());
+               $$->bookpaper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultbookpaper"))->clone ());
+               scm_gc_unprotect_object ($$->bookpaper_->self_scm ());
+               $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); 
        }
-       | book_body score_block {
-               $$->scores_.push ($2);
+       | book_body book_paper_block {
+               $$->bookpaper_ = $2;
                scm_gc_unprotect_object ($2->self_scm ());
        }
+       | book_body score_block {
+               Score *score = $2;
+               $$->scores_.push (score);
+               scm_gc_unprotect_object (score->self_scm ());
+       }
+       | book_body Composite_music {
+               Music *music = $2;
+               Score *score
+                       = unsmob_score (ly_music_scorify (music->self_scm ()));
+               $$->scores_.push (score);
+               scm_gc_unprotect_object (music->self_scm ());
+       }
+       | book_body lilypond_header {
+               $$->header_ = $2;
+       }
        | book_body error {
+
        }
        ;
 
@@ -687,25 +675,31 @@ score_block:
        ;
 
 score_body:
-       Music   {
+       /**/    {
                $$ = new Score;
        
                $$->set_spot (THIS->here_input ());
-               SCM m = $1->self_scm ();
+       }
+       | SCORE_IDENTIFIER {
+               $$ = new Score ( *unsmob_score ($1));
+               $$->set_spot (THIS->here_input ());
+       }
+       | score_body Music {
+               SCM m = $2->self_scm ();
                scm_gc_unprotect_object (m);
-
+       
                /*
                        guh.
                */
                SCM check_funcs = ly_scheme_function ("toplevel-music-functions");
                for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs))
                        m = scm_call_1 (ly_car (check_funcs), m);
+               if (unsmob_music ($$->music_))
+               {
+                       THIS->parser_error (_("Already have music in score"));
+                       unsmob_music ($$->music_)->origin ()->error (_("This is the previous music"));
+               }
                $$->music_ = m;
-
-       }
-       | SCORE_IDENTIFIER {
-               $$ = new Score ( *unsmob_score ($1));
-               $$->set_spot (THIS->here_input ());
        }
        | score_body lilypond_header    {
                $$->header_ = $2;
@@ -721,37 +715,48 @@ score_body:
 
 
 /*
-       MIDI
+       OUTPUT DEF
 */
-output_def:
-       music_output_def_body '}' {
+
+book_paper_block:
+       output_def {
                $$ = $1;
-               THIS->lexer_->remove_scope ();
-               THIS->lexer_->pop_state ();
+               if ($$->lookup_variable (ly_symbol2scm ("is-bookpaper")) != SCM_BOOL_T)
+               {
+                       THIS->parser_error (_("Need \\bookpaper for bookpaper block."));
+                       $$ = get_bookpaper (THIS);
+               }
        }
        ;
 
-music_output_def_head:
-       MIDI    {
-               Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultmidi"));
 
+output_def:
+       output_def_body '}' {
+               $$ = $1;
+               if ($1->parent_)
+                       THIS->lexer_->remove_scope ();
 
-               Midi_def *p = 0;
-               if (id)
-                       p = dynamic_cast<Midi_def*> (id->clone ());
-               else
-                       p = new Midi_def;
+               THIS->lexer_->remove_scope ();
+               THIS->lexer_->pop_state ();
+       }
+       ;
 
+output_def_head:
+       BOOKPAPER {
+               $$ = get_bookpaper (THIS);
+               $$->input_origin_ = THIS->here_input ();
+               THIS->lexer_->add_scope ($$->scope_);
+       }
+       | MIDI    {
+               Output_def *p = get_midi (THIS);
                $$ = p;
                THIS->lexer_->add_scope (p->scope_);
        }
        | PAPER         {
-               Music_output_def *id = unsmob_music_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"));
-                 Paper_def *p = 0;
-               if (id)
-                       p = dynamic_cast<Paper_def*> (id->clone ());
-               else
-                       p = new Paper_def;
+               Output_def* p = get_paper (THIS);
+
+               if (p->parent_)
+                       THIS->lexer_->add_scope (p->parent_->scope_);
 
                THIS->lexer_->add_scope (p->scope_);
                $$ = p;
@@ -759,40 +764,38 @@ music_output_def_head:
        ;
 
 
-music_output_def_body:
-       music_output_def_head '{' {
+output_def_body:
+       output_def_head '{' {
                $$ = $1;
-               $$->input_origin_. set_spot (THIS->here_input ());
+               $$->input_origin_.set_spot (THIS->here_input ());
                THIS->lexer_->push_initial_state ();
        }
-       | music_output_def_head '{' MUSIC_OUTPUT_DEF_IDENTIFIER         {
+       | output_def_head '{' OUTPUT_DEF_IDENTIFIER     {
                scm_gc_unprotect_object ($1->self_scm ());
-               Music_output_def *o = unsmob_music_output_def ($3);
+               Output_def *o = unsmob_output_def ($3);
                o->input_origin_.set_spot (THIS->here_input ());
                $$ = o;
                THIS->lexer_->remove_scope ();
                THIS->lexer_->add_scope (o->scope_);
                THIS->lexer_->push_initial_state ();
        }
-       | music_output_def_body assignment  {
+       | output_def_body assignment  {
 
        }
-       | music_output_def_body context_def_spec_block  {
-               $$->assign_context_def ($2);
+       | output_def_body context_def_spec_block        {
+               assign_context_def ($$, $2);
        }
-       | music_output_def_body tempo_event  {
+       | output_def_body tempo_event  {
                /*
                        junk this ? there already is tempo stuff in
                        music.
                */
-               int m = ly_scm2int ( $2->get_property ("metronome-count"));
+               int m = ly_scm2int ($2->get_property ("metronome-count"));
                Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
-               Midi_def *md = dynamic_cast<Midi_def*> ($$);
-               if (md)
-                       md->set_tempo (d->get_length (), m);
+               set_tempo ($$, d->get_length (), m);
                scm_gc_unprotect_object ($2->self_scm ());
        }
-       | music_output_def_body error {
+       | output_def_body error {
 
        }
        ;
@@ -826,6 +829,8 @@ Music_list:
                        scm_set_car_x (s, c); /* set first cons */
                scm_set_cdr_x (s, c);  /* remember last cell */
        }
+       | Music_list embedded_scm {
+       }
        | Music_list error {
        }
        ;
@@ -845,8 +850,9 @@ Alternative_music:
        }
        ;
 
+
 Repeated_music:
-       REPEAT string bare_unsigned Music Alternative_music
+       REPEAT simple_string bare_unsigned Music Alternative_music
        {
                Music *beg = $4;
                int times = $3;
@@ -933,20 +939,6 @@ Simultaneous_music:
 
 Simple_music:
        event_chord             { $$ = $1; }
-       | APPLYOUTPUT embedded_scm {
-               if (!ly_input_procedure_p ($2))
-                       THIS->parser_error (_ ("\\applycontext takes function argument"));
-               $$ = MY_MAKE_MUSIC ("ApplyOutputEvent");
-               $$->set_property ("procedure", $2);
-               $$->set_spot (THIS->here_input ());
-       }
-       | APPLYCONTEXT embedded_scm {
-               if (!ly_input_procedure_p ($2))
-                       THIS->parser_error (_ ("\\applycontext takes function argument"));
-               $$ = MY_MAKE_MUSIC ("ApplyContext");
-               $$->set_property ("procedure", $2);
-               $$->set_spot (THIS->here_input ());
-       }
        | MUSIC_IDENTIFIER {
                $$ = unsmob_music ($1);
        }
@@ -957,13 +949,12 @@ Simple_music:
 
 optional_context_mod:
        /**/ { $$ = SCM_EOL; }
-       | WITH '{' context_mod_list '}'  { $$ = $3; }
-       ;
-
-grace_head:
-       GRACE  { $$ = scm_makfrom0str ("Grace"); }
-       | ACCIACCATURA { $$ = scm_makfrom0str ("Acciaccatura"); }
-       | APPOGGIATURA { $$ = scm_makfrom0str ("Appoggiatura"); }
+       | WITH { THIS->lexer_->push_initial_state (); }
+       '{' context_mod_list '}'
+       {
+               THIS->lexer_->pop_state ();
+               $$ = $4;
+       }
        ;
 
 context_mod_list:
@@ -973,87 +964,112 @@ context_mod_list:
        }
        ;
 
+
 Composite_music:
-       AUTOCHANGE Music        {
-               SCM proc = ly_scheme_function ("make-autochange-music");
-       
-               SCM res = scm_call_1 (proc, $2->self_scm ());
-               scm_gc_unprotect_object ($2->self_scm ());
-               $$ = unsmob_music (res);
-               scm_gc_protect_object (res);
-               $$->set_spot (THIS->here_input ());
-       }
-       | PARTCOMBINE Music Music {
-               SCM proc = ly_scheme_function ("make-part-combine-music");
+       Prefix_composite_music { $$ = $1; }
+       | Grouped_music_list { $$ = $1; }
+       ;
 
-               SCM res = scm_call_1 (proc, scm_listify ($2->self_scm (),
-                       $3->self_scm (), SCM_UNDEFINED));
+Grouped_music_list:
+       Simultaneous_music              { $$ = $1; }
+       | Sequential_music              { $$ = $1; }
+       ;
+
+Generic_prefix_music_scm:
+       MUSIC_FUNCTION {
+               $$ = scm_list_2 ($1, make_input (THIS->here_input ()));
+       }
+       | MUSIC_FUNCTION_SCM {
+               THIS->push_spot ();
+       } embedded_scm {
+               $$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3);
+       }
+       | MUSIC_FUNCTION_MUSIC {
+               THIS->push_spot (); 
+       } Music {
+               $$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3->self_scm ());
                scm_gc_unprotect_object ($3->self_scm ());
-               scm_gc_unprotect_object ($2->self_scm ());
-               $$ = unsmob_music (res);
-               scm_gc_protect_object (res);
-               $$->set_spot (THIS->here_input ());
        }
-       | grace_head Music {
-#if 1
-       /*
-               The other version is for easier debugging  of
-               Sequential_music_iterator in combination with grace notes.
-       */
-
-/*
-
-TODO: should distinguish between both grace types in the
-basic music objects too, since the meaning is different.
-
-*/
-
-               String start_str = "start" + ly_scm2string ($1) + "Music";
-               String stop_str = "stop" + ly_scm2string ($1) + "Music";
-               
-               SCM start = THIS->lexer_->lookup_identifier (start_str);
-               SCM stop = THIS->lexer_->lookup_identifier (stop_str);
-
-               Music *startm = unsmob_music (start);
-               Music *stopm = unsmob_music (stop);
-
-               SCM ms = SCM_EOL;
-               if (stopm) {
-                       stopm = stopm->clone ();
-                       ms = scm_cons (stopm->self_scm (), ms);
-                       scm_gc_unprotect_object (stopm->self_scm ());
-               }
-               ms = scm_cons ($2->self_scm (), ms);
-               scm_gc_unprotect_object ($2->self_scm ());
-               if (startm) {
-                       startm = startm->clone ();
-                       ms = scm_cons (startm->self_scm (), ms);
-                       scm_gc_unprotect_object (startm->self_scm ());
+       | MUSIC_FUNCTION_SCM_MUSIC {
+               THIS->push_spot (); 
+       }  embedded_scm Music {
+               $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4->self_scm ());
+               scm_gc_unprotect_object ($4->self_scm ());
+       }
+       | MUSIC_FUNCTION_SCM_SCM {
+               THIS->push_spot (); 
+       }  embedded_scm embedded_scm {
+               $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4);
+       }
+       | MUSIC_FUNCTION_MUSIC_MUSIC {
+               THIS->push_spot (); 
+       }  Music  Music {
+               $$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3->self_scm (), $4->self_scm ());
+               scm_gc_unprotect_object ($3->self_scm ());
+               scm_gc_unprotect_object ($4->self_scm ());
+       }
+       | MUSIC_FUNCTION_SCM_MUSIC_MUSIC {
+               THIS->push_spot (); 
+       } embedded_scm Music Music {
+               $$ = scm_list_5 ($1, make_input (THIS->pop_spot ()),
+                       $3, $4->self_scm (), $5->self_scm ());
+               scm_gc_unprotect_object ($5->self_scm ());
+               scm_gc_unprotect_object ($4->self_scm ());
+       }
+       ;
+
+Generic_prefix_music:
+       Generic_prefix_music_scm {
+               SCM func = ly_car ($1);
+               Input *loc = unsmob_input (ly_cadr ($1));
+               SCM args = ly_cddr ($1);
+               SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
+               int k = 0;
+               bool ok  = true; 
+               for (SCM s = sig, t = args;
+                       ok && ly_c_pair_p (s) && ly_c_pair_p (t);
+                       s = ly_cdr (s), t = ly_cdr (t)) {
+                       k++;
+                       if (scm_call_1 (ly_car (s), ly_car (t)) != SCM_BOOL_T)
+                       {
+                               loc->error (_f ("Argument %d failed typecheck", k));
+                               THIS->error_level_ = 1;
+                               ok = false;
+                       }
                }
+               SCM m = SCM_EOL;
+               if (ok)
+                       m = scm_apply_0 (func, ly_cdr ($1));
+               if (unsmob_music (m))
+                       {
+                       $$ = unsmob_music (m);
+                       scm_gc_protect_object (m);
+                       }
+               else 
+                       {
+                       if (ok)
+                               loc->error (_ ("Music head function should return Music object.")); 
+                       $$ = MY_MAKE_MUSIC ("Music");
+                       }
+               $$->set_spot (*loc);
+       }
+       ;
 
-               Music* seq = MY_MAKE_MUSIC ("SequentialMusic");
-               seq->set_property ("elements", ms);
 
-               
-               $$ = MY_MAKE_MUSIC ("GraceMusic");
-               $$->set_property ("element", seq->self_scm ());
-               scm_gc_unprotect_object (seq->self_scm ());
-#else
-               $$ = MY_MAKE_MUSIC ("GraceMusic");
-               $$->set_property ("element", $2->self_scm ());
-               scm_gc_unprotect_object ($2->self_scm ());
-#endif
+Prefix_composite_music:
+       Generic_prefix_music {
+               $$ = $1;
        }
-       | CONTEXT string '=' string optional_context_mod Music {
+       | CONTEXT simple_string '=' simple_string optional_context_mod Music {
                $$ = context_spec_music ($2, $4, $6, $5);
 
        }
        | CONTEXT simple_string optional_context_mod Music {
                $$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
        }
-       | NEWCONTEXT string optional_context_mod Music {
-               $$ = context_spec_music ($2, get_next_unique_context (),
-                                        $4, $3);
+       | NEWCONTEXT simple_string optional_context_mod Music {
+               $$ = context_spec_music ($2, get_next_unique_context (), $4,
+                       $3);
        }
 
        | TIMES {
@@ -1077,8 +1093,6 @@ basic music objects too, since the meaning is different.
 
        }
        | Repeated_music                { $$ = $1; }
-       | Simultaneous_music            { $$ = $1; }
-       | Sequential_music              { $$ = $1; }
        | TRANSPOSE pitch_also_in_chords pitch_also_in_chords Music {
                $$ = MY_MAKE_MUSIC ("TransposedMusic");
                Music *p = $4;
@@ -1089,29 +1103,12 @@ basic music objects too, since the meaning is different.
                $$->set_property ("element", p->self_scm ());
                scm_gc_unprotect_object (p->self_scm ());
        }
-       | APPLY embedded_scm Music  {
-               if (!ly_input_procedure_p ($2))
-                       {
-                       THIS->parser_error (_ ("\\apply takes function argument"));
-                       $$ = $3;
-                       }
-               else
-                       {
-                       SCM ret = scm_call_1 ($2, $3->self_scm ());
-                       Music *m = unsmob_music (ret);
-                       if (!m) {
-                               THIS->parser_error ("\\apply must return a Music");
-                               m = MY_MAKE_MUSIC ("Music");
-                               }
-                       $$ = m;
-                       }
-       }
        | NOTES
                {
                SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
                THIS->lexer_->push_note_state (alist_to_hashq (nn));
        }
-       Music
+       Grouped_music_list
                { $$ = $3;
                  THIS->lexer_->pop_state ();
                }
@@ -1120,13 +1117,13 @@ basic music objects too, since the meaning is different.
                SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames");
                THIS->lexer_->push_note_state (alist_to_hashq (nn));
        }
-       Music
+       Grouped_music_list
                { $$ = $3;
                  THIS->lexer_->pop_state ();
                }
        | FIGURES
                { THIS->lexer_->push_figuredbass_state (); }
-       Music
+       Grouped_music_list
                {
                  Music *chm = MY_MAKE_MUSIC ("UntransposableMusic");
                  chm->set_property ("element", $3->self_scm ());
@@ -1141,7 +1138,9 @@ basic music objects too, since the meaning is different.
                nn = THIS->lexer_->lookup_identifier ("pitchnames");
                THIS->lexer_->push_chord_state (alist_to_hashq (nn));
 
-       } Music {
+       }
+       Grouped_music_list
+       {
                  Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
                  chm->set_property ("element", $3->self_scm ());
                  scm_gc_unprotect_object ($3->self_scm ());
@@ -1151,7 +1150,7 @@ basic music objects too, since the meaning is different.
        }
        | LYRICS
                { THIS->lexer_->push_lyric_state (); }
-       Music
+       Grouped_music_list
                {
                  $$ = $3;
                  THIS->lexer_->pop_state ();
@@ -1173,30 +1172,69 @@ relative_music:
        }
        | RELATIVE Composite_music {
                Music *m = $2;
-               /* FIXME: why is octave==0 and default not middleC? */
-               Pitch middle_c (-1, 0, 0);
+
+               Pitch middle_c (0, 0, 0);
                $$ = make_music_relative (middle_c, m);
                scm_gc_unprotect_object (m->self_scm ());
        }
        ;
 
-re_rhythmed_music:
-       ADDLYRICS { THIS->lexer_->push_lyric_state (); }
-       /* cont */
-       Music {
+new_lyrics:
+       NEWLYRICS { THIS->lexer_->push_lyric_state (); }
+       /*cont */
+       Grouped_music_list {
+       /* Can also use Music at the expensive of two S/Rs similar to
+           \repeat \alternative */
+               THIS->lexer_->pop_state ();
+#if 0
+               Music *music = MY_MAKE_MUSIC ("SimultaneousMusic");
+               music->set_property ("elements", scm_list_1 ($3->self_scm ()));
+               $$ = music;
+#else
+               $$ = scm_cons ($3->self_scm (), SCM_EOL);
+#endif
+       }
+       | new_lyrics NEWLYRICS { THIS->lexer_->push_lyric_state (); }
+       Grouped_music_list {
                THIS->lexer_->pop_state ();
+               $$ = scm_cons ($4->self_scm (), $1);
+       }
+       ;
+
+re_rhythmed_music:
+       Grouped_music_list new_lyrics {
+
+               /* FIXME: should find out uniqueXXX name from music */
+               SCM name = $1->get_property ("context-id");
+               //if (name == SCM_EOL)
+               if (!ly_c_string_p (name))
+                       name = scm_makfrom0str ("");
 
-               Music *music = $3;
-               SCM name = scm_makfrom0str ("");
-               Music *combined = make_lyric_combine_music (name, music);
                SCM context = scm_makfrom0str ("Lyrics");
-               $$ = context_spec_music (context, SCM_UNDEFINED, combined,
-                       SCM_EOL);
-               scm_gc_unprotect_object (music->self_scm ());
+               Music *all = MY_MAKE_MUSIC ("SimultaneousMusic");
+
+               SCM lst = SCM_EOL;
+               for (SCM s = $2; ly_c_pair_p (s); s = ly_cdr (s))
+               {
+                       Music *music = unsmob_music (ly_car (s));
+                       Music *com = make_lyric_combine_music (name, music);
+                       Music *csm = context_spec_music (context,
+                               get_next_unique_context (), com, SCM_EOL);
+                       lst = scm_cons (csm->self_scm (), lst);
+               }
+               /* FIXME: only first lyric music is accepted,
+                         the rest is junked */
+               all->set_property ("elements", scm_cons ($1->self_scm (),
+                       lst));
+               $$ = all;
+               scm_gc_unprotect_object ($1->self_scm ());
        }
-       | LYRICSTO string Music {
-               Music *music = $3;
-               SCM name = $2;
+       | LYRICSTO {
+               THIS->lexer_->push_lyric_state ();
+       } simple_string Music {
+               THIS->lexer_->pop_state ();
+               Music *music = $4;
+               SCM name = $3;
                $$ = make_lyric_combine_music (name, music);
                scm_gc_unprotect_object (music->self_scm ());
        }
@@ -1213,12 +1251,6 @@ context_change:
        }
        ;
 
-simple_string: STRING {
-          }
-       | LYRICS_STRING {
-       }
-       ;
-
 property_operation:
        STRING '=' scalar {
                $$ = scm_list_3 (ly_symbol2scm ("assign"),
@@ -1239,8 +1271,7 @@ property_operation:
        ;
 
 context_def_mod:
-       CONSISTSEND { $$ = ly_symbol2scm ("consists-end"); }
-       | CONSISTS { $$ = ly_symbol2scm ("consists"); }
+       CONSISTS { $$ = ly_symbol2scm ("consists"); }
        | REMOVE { $$ = ly_symbol2scm ("remove"); }
 
        | ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
@@ -1261,6 +1292,11 @@ context_mod:
 
 context_prop_spec:
        simple_string {
+               if (!is_regular_identifier ($1))
+               {
+                       THIS->here_input ().error (_("Grob name should be alphanumeric"));
+               }
+
                $$ = scm_list_2 (ly_symbol2scm ("Bottom"),
                        scm_string_to_symbol ($1));
        }
@@ -1308,17 +1344,49 @@ music_property_def:
        ;
 
 
+string:
+       STRING {
+               $$ = $1;
+       }
+       | STRING_IDENTIFIER {
+               $$ = $1;
+       }
+       | string '+' string {
+               $$ = scm_string_append (scm_list_2 ($1, $3));
+       }
+       ;
 
-scalar:
-        string          { $$ = $1; }
-        | bare_int      { $$ = scm_int2num ($1); }
-        | embedded_scm  { $$ = $1; }
-       | full_markup {  $$ = $1; }
-       | DIGIT { $$ = scm_int2num ($1); }
+simple_string: STRING {
+               $$ = $1;
+       }
+       | LYRICS_STRING {
+               $$ = $1;
+       }
+       ;
+
+scalar: string {
+               $$ = $1;
+       }
+       | LYRICS_STRING {
+               $$ = $1;
+       }
+        | bare_int {
+               $$ = scm_int2num ($1);
+       }
+        | embedded_scm {
+               $$ = $1;
+       }
+       | full_markup {
+               $$ = $1;
+       }
+       | DIGIT {
+               $$ = scm_int2num ($1);
+       }
        ;
 
 /*
-This is a trick:
+
+pre_events doesn't contain anything. It is a trick:
 
 Adding pre_events to the simple_element
 makes the choice between
@@ -1376,10 +1444,10 @@ chord_open: '<'
 chord_close: '>'
        ;
 
-simul_open: LESSLESS
+simul_open: DOUBLE_ANGLE_OPEN
        ;
 
-simul_close: MOREMORE
+simul_close: DOUBLE_ANGLE_CLOSE
        ;
 
 chord_body:
@@ -1400,19 +1468,31 @@ chord_body_elements:
        ;
 
 chord_body_element:
-       pitch exclamations questions post_events
+       pitch  exclamations questions octave_check post_events
        {
+               int q = $3;
+               int ex = $2;
+               SCM check = $4;
+               SCM post = $5;
+
                Music *n = MY_MAKE_MUSIC ("NoteEvent");
                n->set_property ("pitch", $1);
-               if ($3 % 2)
+               if (q % 2)
                        n->set_property ("cautionary", SCM_BOOL_T);
-               if ($2 % 2 || $3 % 2)
+               if (ex % 2 || q % 2)
                        n->set_property ("force-accidental", SCM_BOOL_T);
 
-               if (ly_c_pair_p ($4)) {
-                       SCM arts = scm_reverse_x ($4, SCM_EOL);
+               if (ly_c_pair_p (post)) {
+                       SCM arts = scm_reverse_x (post, SCM_EOL);
                        n->set_property ("articulations", arts);
                }
+               if (ly_c_number_p (check))
+               {
+                       int q = ly_scm2int (check);
+                       n->set_property ("absolute-octave", scm_int2num (q-1));
+               }
+
+               
                $$ = n;
        }
        | DRUM_PITCH post_events {
@@ -1565,10 +1645,7 @@ command_element:
        ;
 
 command_req:
-       BREATHE {
-               $$ = MY_MAKE_MUSIC ("BreathingSignEvent");
-       }
-       | E_TILDE {
+       E_TILDE {
                $$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
        }
        | MARK DEFAULT  {
@@ -1723,7 +1800,7 @@ direction_reqd_event:
        }
        ;
 
-oct_check:
+octave_check:
        /**/ { $$ = SCM_EOL; }
        | '='  { $$ = scm_int2num (0); }
        | '=' sub_quotes { $$ = scm_int2num ($2); }
@@ -1836,7 +1913,8 @@ open_event:
        | E_CLOSE       {
                Music *s= MY_MAKE_MUSIC ("PhrasingSlurEvent");
                $$ = s;
-               s->set_property ("span-type", scm_makfrom0str ( "phrasing-slur"));
+               s->set_property ("span-type",
+                       scm_makfrom0str ("phrasing-slur"));
                s->set_spot (THIS->here_input ());
        }
        ;
@@ -1850,7 +1928,8 @@ gen_text_def:
        }
        | string {
                Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
-               t->set_property ("text", make_simple_markup (THIS->lexer_->encoding (), $1));
+               t->set_property ("text",
+                       make_simple_markup (THIS->lexer_->encoding (), $1));
                t->set_spot (THIS->here_input ());
                $$ = t;
        
@@ -1939,9 +2018,6 @@ steno_duration:
        }
        ;
 
-
-
-
 multiplied_duration:
        steno_duration {
                $$ = $1;
@@ -1972,7 +2048,6 @@ dots:
        }
        ;
 
-
 tremolo_type:
        ':'     {
                $$ = 0;
@@ -1984,17 +2059,16 @@ tremolo_type:
        }
        ;
 
-
-
-/*****************************************************************
-               BASS FIGURES
-*****************************************************************/
 bass_number:
        DIGIT   {
                $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+               $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+                               $$);
        }
        | UNSIGNED {
                $$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
+               $$ = scm_list_2 (ly_scheme_function ("number-markup"),
+                               $$);
        }
        | STRING { $$ = $1; }
        ;
@@ -2071,7 +2145,7 @@ optional_rest:
        ;
 
 simple_element:
-       pitch exclamations questions oct_check optional_notemode_duration optional_rest {
+       pitch exclamations questions octave_check optional_notemode_duration optional_rest {
 
                Input i = THIS->pop_spot ();
                if (!THIS->lexer_->is_note_state ())
@@ -2339,20 +2413,6 @@ bare_int:
        }
        ;
 
-
-string:
-       STRING          {
-               $$ = $1;
-       }
-       | STRING_IDENTIFIER     {
-               $$ = $1;
-       }
-       | string '+' string {
-               $$ = scm_string_append (scm_list_2 ($1, $3));
-       }
-       ;
-
-
 exclamations:
                { $$ = 0; }
        | exclamations '!'      { $$ ++; }
@@ -2421,6 +2481,15 @@ markup:
        | STRING_IDENTIFIER {
                $$ = $1;
        }
+       | SCORE {
+               SCM nn = THIS->lexer_->lookup_identifier ("pitchnames");
+               THIS->lexer_->push_note_state (alist_to_hashq (nn));
+       } '{' score_body '}' {
+               Score * sc = $4;
+               $$ = scm_list_2 (ly_scheme_function ("score-markup"), sc->self_scm ());
+               scm_gc_unprotect_object (sc->self_scm ());
+               THIS->lexer_->pop_state ();
+       }
        ;
 
 markup_list:
@@ -2446,7 +2515,7 @@ markup_list_body:
 %%
 
 void
-My_lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool )
 {
 #if 0
        yydebug = 1;
@@ -2454,7 +2523,7 @@ My_lily_parser::set_yydebug (bool )
 }
 
 void
-My_lily_parser::do_yyparse ()
+Lily_parser::do_yyparse ()
 {
        yyparse ((void*)this);
 }
@@ -2472,7 +2541,7 @@ skipTypesetting speeds it up a lot.
 */
 
 void
-My_lily_parser::beam_check (SCM dur)
+Lily_parser::beam_check (SCM dur)
 {
   Duration *d = unsmob_duration (dur);
   if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
@@ -2493,7 +2562,7 @@ otherwise, we have to import music classes into the lexer.
 
 */
 int
-My_lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
+Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 {
        if (ly_c_string_p (sid)) {
                *destination = sid;
@@ -2518,12 +2587,12 @@ My_lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
        } else if (unsmob_duration (sid)) {
                *destination = unsmob_duration (sid)->smobbed_copy ();
                return DURATION_IDENTIFIER;
-       } else if (unsmob_music_output_def (sid)) {
-               Music_output_def *p = unsmob_music_output_def (sid);
+       } else if (unsmob_output_def (sid)) {
+               Output_def *p = unsmob_output_def (sid);
                p = p->clone ();
 
                *destination = p->self_scm ();
-               return MUSIC_OUTPUT_DEF_IDENTIFIER;
+               return OUTPUT_DEF_IDENTIFIER;
        } else if (Text_item::markup_p (sid)) {
                *destination = sid;
                return MARKUP_IDENTIFIER;
@@ -2582,7 +2651,7 @@ property_op_to_music (SCM op)
                        internal_type_checking_global_b = itc;
                }
 
-       if (op == ly_symbol2scm ("poppush"))
+       if (tag == ly_symbol2scm ("poppush"))
                m->set_property ("pop-first", SCM_BOOL_T);
 
 
@@ -2606,15 +2675,12 @@ context_spec_music (SCM type, SCM id, Music *m, SCM ops)
        return csm;
 }
 
-
 SCM
 get_next_unique_context ()
 {
        static int new_context_count;
-
        char s[1024];
-       snprintf (s, 1024, "uniqueContext%d", new_context_count ++);
-               
+       snprintf (s, 1024, "uniqueContext%d", new_context_count++);
        return scm_makfrom0str (s);
 }