]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/parser.yy
Remove Font_metric::index_to_ascii.
[lilypond.git] / lily / parser.yy
index 4bf3c9d191e98d5585404c45d16b2aa3858fb2ed..3268ae1e2573e52168d35d3945742ea0c7175062 100644 (file)
@@ -1,10 +1,21 @@
 /*
-  parser.yy -- Bison/C++ parser for LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
-
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 %{
@@ -44,7 +55,7 @@ of the parse stack onto the heap. */
 
 or
 
-    \repeat { \repeat } \alternative 
+    \repeat { \repeat } \alternative
 */
 
 
@@ -151,14 +162,15 @@ void set_music_properties (Music *p, SCM a);
 
    FIXME: Bison needs to translate some of these, eg, STRING.
 
-*/     
-   
+*/
+
 /* Keyword tokens with plain escaped name.  */
 %token ACCEPTS "\\accepts"
 %token ADDLYRICS "\\addlyrics"
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
 %token BOOK "\\book"
+%token BOOKPART "\\bookpart"
 %token CHANGE "\\change"
 %token CHORDMODE "\\chordmode"
 %token CHORDS "\\chords"
@@ -182,10 +194,11 @@ void set_music_properties (Music *p, SCM a);
 %token LYRICSTO "\\lyricsto"
 %token MARK "\\mark"
 %token MARKUP "\\markup"
+%token MARKUPLINES "\\markuplines"
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
-%token OBJECTID "\\objectid"   
+%token OBJECTID "\\objectid"
 %token OCTAVE "\\octave"
 %token ONCE "\\once"
 %token OVERRIDE "\\override"
@@ -264,6 +277,7 @@ If we give names, Bison complains.
 %token <scm> BOOK_IDENTIFIER
 %token <scm> CHORDMODIFIER_PITCH
 %token <scm> CHORD_MODIFIER
+%token <scm> CHORD_REPETITION
 %token <scm> CONTEXT_DEF_IDENTIFIER
 %token <scm> DRUM_PITCH
 %token <scm> DURATION_IDENTIFIER
@@ -279,7 +293,14 @@ If we give names, Bison complains.
 %token <scm> MARKUP_HEAD_SCM0_MARKUP1
 %token <scm> MARKUP_HEAD_SCM0_SCM1
 %token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
+%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3
+%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
 %token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_LIST_HEAD_EMPTY
+%token <scm> MARKUP_LIST_HEAD_LIST0
+%token <scm> MARKUP_LIST_HEAD_SCM0
+%token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
+%token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
 %token <scm> MARKUP_IDENTIFIER
 %token <scm> MUSIC_FUNCTION
 %token <scm> MUSIC_IDENTIFIER
@@ -298,6 +319,8 @@ If we give names, Bison complains.
 
 %type <book> book_block
 %type <book> book_body
+%type <book> bookpart_block
+%type <book> bookpart_body
 
 %type <i> bare_unsigned
 %type <scm> figured_bass_alteration
@@ -342,10 +365,10 @@ If we give names, Bison complains.
 %type <outputdef> output_def_head
 %type <outputdef> output_def_head_with_mode_switch
 %type <outputdef> output_def
-%type <outputdef> paper_block 
+%type <outputdef> paper_block
 
 %type <scm> alternative_music
-%type <scm> generic_prefix_music_scm 
+%type <scm> generic_prefix_music_scm
 %type <scm> music_list
 %type <scm> absolute_pitch
 %type <scm> assignment_id
@@ -372,6 +395,7 @@ If we give names, Bison complains.
 %type <scm> figure_spec
 %type <scm> fraction
 %type <scm> full_markup
+%type <scm> full_markup_list
 %type <scm> function_scm_argument
 %type <scm> function_arglist
 %type <scm> function_arglist_music_last
@@ -384,8 +408,9 @@ If we give names, Bison complains.
 %type <scm> lyric_markup
 %type <scm> markup
 %type <scm> markup_braced_list
-%type <scm> markup_braced_list_body 
+%type <scm> markup_braced_list_body
 %type <scm> markup_composed_list
+%type <scm> markup_command_list
 %type <scm> markup_head_1_item
 %type <scm> markup_head_1_list
 %type <scm> markup_list
@@ -410,7 +435,7 @@ If we give names, Bison complains.
 %type <scm> pitch_also_in_chords
 %type <scm> post_events
 %type <scm> property_operation
-%type <scm> property_path
+%type <scm> property_path property_path_revved
 %type <scm> scalar
 %type <scm> script_abbreviation
 %type <scm> simple_chord_elements
@@ -420,7 +445,7 @@ If we give names, Bison complains.
 %type <scm> steno_pitch
 %type <scm> steno_tonic_pitch
 %type <scm> step_number
-%type <scm> step_numbers 
+%type <scm> step_numbers
 %type <scm> string
 
 %type <score> score_block
@@ -451,7 +476,7 @@ lilypond:   /* empty */
 
 
 object_id_setting:
-       OBJECTID STRING { $$ = $2; } 
+       OBJECTID STRING { $$ = $2; }
        ;
 
 toplevel_expression:
@@ -464,9 +489,15 @@ toplevel_expression:
                scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
                book->unprotect ();
        }
+       | bookpart_block {
+               Book *bookpart = $1;
+               SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-bookpart-handler");
+               scm_call_2 (proc, PARSER->self_scm (), bookpart->self_scm ());
+               bookpart->unprotect ();
+       }
        | score_block {
                Score *score = $1;
-               
+
                SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-score-handler");
                scm_call_2 (proc, PARSER->self_scm (), score->self_scm ());
                score->unprotect ();
@@ -477,6 +508,10 @@ toplevel_expression:
                scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
        }
        | full_markup {
+               SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
+               scm_call_2 (proc, PARSER->self_scm (), scm_list_1 ($1));
+       }
+       | full_markup_list {
                SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
                scm_call_2 (proc, PARSER->self_scm (), $1);
        }
@@ -508,7 +543,7 @@ lilypond_header_body:
                PARSER->lexer_->add_scope ($$);
        }
        | lilypond_header_body assignment  {
-               
+
        }
        ;
 
@@ -529,7 +564,11 @@ assignment_id:
 assignment:
        assignment_id '=' identifier_init  {
                PARSER->lexer_->set_identifier ($1, $3);
-
+       }
+       | assignment_id property_path '=' identifier_init {
+               SCM path = scm_cons (scm_string_to_symbol ($1), $2);
+               PARSER->lexer_->set_identifier (path, $4);
+       ;
 /*
  TODO: devise standard for protection in parser.
 
@@ -551,6 +590,10 @@ identifier_init:
                $$ = $1->self_scm ();
                $1->unprotect ();
        }
+       | bookpart_block {
+               $$ = $1->self_scm ();
+               $1->unprotect ();
+       }
        | output_def {
                $$ = $1->self_scm ();
                $1->unprotect ();
@@ -618,7 +661,7 @@ context_def_spec_body:
                }
        }
        | context_def_spec_body context_mod {
-               unsmob_context_def ($$)->add_context_mod ($2);          
+               unsmob_context_def ($$)->add_context_mod ($2);
        }
        ;
 
@@ -627,6 +670,8 @@ context_def_spec_body:
 book_block:
        BOOK '{' book_body '}'  {
                $$ = $3;
+               pop_paper (PARSER);
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
        }
        ;
 
@@ -636,27 +681,51 @@ book_block:
 book_body:
        {
                $$ = new Book;
+               init_papers (PARSER);
                $$->origin ()->set_spot (@$);
                $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
                $$->paper_->unprotect ();
-               $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader"); 
+               push_paper (PARSER, $$->paper_);
+               $$->header_ = PARSER->lexer_->lookup_identifier ("$defaultheader");
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $$->self_scm ());
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("book-output-suffix"), SCM_BOOL_F);
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("book-filename"), SCM_BOOL_F);
        }
        | BOOK_IDENTIFIER {
                $$ = unsmob_book ($1);
                $$->protect ();
                $$->origin ()->set_spot (@$);
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
        }
        | book_body paper_block {
                $$->paper_ = $2;
                $2->unprotect ();
+               set_paper (PARSER, $2);
+       }
+       | book_body bookpart_block {
+               Book *bookpart = $2;
+               SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler");
+               scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ());
+               bookpart->unprotect ();
        }
        | book_body score_block {
-               SCM s = $2->self_scm ();
-               $$->add_score (s);
-               $2->unprotect();
+               Score *score = $2;
+               SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
+               scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+               score->unprotect ();
+       }
+       | book_body composite_music {
+               Music *music = unsmob_music ($2);
+               SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler");
+               scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
        }
        | book_body full_markup {
-               $$->add_score ($2);
+               SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+               scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+       }
+       | book_body full_markup_list {
+               SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+               scm_call_2 (proc, $$->self_scm (), $2);
        }
        | book_body lilypond_header {
                $$->header_ = $2;
@@ -664,12 +733,67 @@ book_body:
        | book_body error {
                $$->paper_ = 0;
                $$->scores_ = SCM_EOL;
+               $$->bookparts_ = SCM_EOL;
        }
        | book_body object_id_setting {
                $$->user_key_ = ly_scm2string ($2);
        }
        ;
 
+bookpart_block:
+       BOOKPART '{' bookpart_body '}' {
+               $$ = $3;
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
+       }
+       ;
+
+bookpart_body:
+       {
+               $$ = new Book;
+               $$->origin ()->set_spot (@$);
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ());
+       }
+       | BOOK_IDENTIFIER {
+               $$ = unsmob_book ($1);
+               $$->protect ();
+               $$->origin ()->set_spot (@$);
+               PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
+       }
+       | bookpart_body paper_block {
+               $$->paper_ = $2;
+               $2->unprotect ();
+       }
+       | bookpart_body score_block {
+               Score *score = $2;
+               SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler");
+               scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+               score->unprotect ();
+       }
+       | bookpart_body composite_music {
+               Music *music = unsmob_music ($2);
+               SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler");
+               scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
+       }
+       | bookpart_body full_markup {
+               SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
+               scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+       }
+       | bookpart_body full_markup_list {
+               SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
+               scm_call_2 (proc, $$->self_scm (), $2);
+       }
+       | bookpart_body lilypond_header {
+               $$->header_ = $2;
+       }
+       | bookpart_body error {
+               $$->paper_ = 0;
+               $$->scores_ = SCM_EOL;
+       }
+       | bookpart_body object_id_setting {
+               $$->user_key_ = ly_scm2string ($2);
+       }
+       ;
+
 score_block:
        SCORE '{' score_body '}'        {
                $$ = $3;
@@ -696,13 +820,13 @@ score_body:
                $$->user_key_ = ly_scm2string ($2);
        }
        | score_body lilypond_header    {
-               $$->header_ = $2;
+               $$->set_header ($2);
        }
        | score_body output_def {
                if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
                {
                        PARSER->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
-               
+
                }
                else
                {
@@ -796,8 +920,20 @@ output_def_body:
 
 tempo_event:
        TEMPO steno_duration '=' bare_unsigned  {
-               $$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4));
-       }                               
+               $$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4));
+       }
+       | TEMPO string steno_duration '=' bare_unsigned {
+               $$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5));
+       }
+       | TEMPO full_markup steno_duration '=' bare_unsigned    {
+               $$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5));
+       }
+       | TEMPO string {
+               $$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) );
+       }
+       | TEMPO full_markup {
+               $$ = MAKE_SYNTAX ("tempoText", @$, $2 );
+       }
        ;
 
 /*
@@ -826,7 +962,7 @@ music_list:
        }
        | music_list error {
                Music *m = MY_MAKE_MUSIC("Music", @$);
-               // ugh. code dup 
+               // ugh. code dup
                m->set_property ("error-found", SCM_BOOL_T);
                SCM s = $$;
                SCM c = scm_cons (m->self_scm (), SCM_EOL);
@@ -915,7 +1051,7 @@ grouped_music_list:
        ;
 
 function_scm_argument:
-       embedded_scm  
+       embedded_scm
        | simple_string
        ;
 
@@ -933,6 +1069,9 @@ function_arglist_nonmusic_last:
        EXPECT_MARKUP function_arglist full_markup {
                $$ = scm_cons ($3, $2);
        }
+       | EXPECT_MARKUP function_arglist simple_string {
+               $$ = scm_cons ($3, $2);
+       }
        | EXPECT_SCM function_arglist function_scm_argument {
                $$ = scm_cons ($3, $2);
        }
@@ -944,6 +1083,9 @@ function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
        | EXPECT_MARKUP function_arglist_nonmusic full_markup {
                $$ = scm_cons ($3, $2);
        }
+       | EXPECT_MARKUP function_arglist_nonmusic simple_string {
+               $$ = scm_cons ($3, $2);
+       }
        | EXPECT_SCM function_arglist_nonmusic function_scm_argument {
                $$ = scm_cons ($3, $2);
        }
@@ -970,7 +1112,7 @@ optional_id:
        | '=' simple_string {
                $$ = $2;
        }
-       ;       
+       ;
 
 
 prefix_composite_music:
@@ -1017,14 +1159,14 @@ prefix_composite_music:
        | re_rhythmed_music     { $$ = $1; }
        ;
 
-mode_changing_head: 
+mode_changing_head:
        NOTEMODE {
                SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
                PARSER->lexer_->push_note_state (alist_to_hashq (nn));
 
                $$ = ly_symbol2scm ("notes");
        }
-       | DRUMMODE 
+       | DRUMMODE
                {
                SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
                PARSER->lexer_->push_note_state (alist_to_hashq (nn));
@@ -1050,7 +1192,7 @@ mode_changing_head:
        }
        ;
 
-mode_changing_head_with_context: 
+mode_changing_head_with_context:
        DRUMS {
                SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
                PARSER->lexer_->push_note_state (alist_to_hashq (nn));
@@ -1124,15 +1266,21 @@ context_change:
        ;
 
 
-property_path:
+property_path_revved:
        embedded_scm {
                $$ = scm_cons ($1, SCM_EOL);
        }
-       | property_path embedded_scm {
+       | property_path_revved embedded_scm {
                $$ = scm_cons ($2, $1);
        }
        ;
 
+property_path:
+       property_path_revved  {
+               $$ = scm_reverse_x ($1, SCM_EOL);
+       }
+       ;
+
 property_operation:
        STRING '=' scalar {
                $$ = scm_list_3 (ly_symbol2scm ("assign"),
@@ -1142,7 +1290,7 @@ property_operation:
                $$ = scm_list_2 (ly_symbol2scm ("unset"),
                        scm_string_to_symbol ($2));
        }
-       | OVERRIDE simple_string property_path '=' embedded_scm {
+       | OVERRIDE simple_string property_path '=' scalar {
                $$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
                                                        scm_string_to_symbol ($2), $5),
                                             $3));
@@ -1172,6 +1320,17 @@ context_mod:
        | context_def_mod STRING {
                $$ = scm_list_2 ($1, $2);
        }
+       | context_def_mod embedded_scm {
+          if (ly_symbol2scm ("consists") != $1)
+          {
+            $$ = SCM_EOL;
+             PARSER->parser_error (@1, _ ("only \\consists takes non-string argument."));
+          }
+          else
+          {
+            $$ = scm_list_2 ($1, $2);
+          }
+       }
        ;
 
 context_prop_spec:
@@ -1192,7 +1351,7 @@ context_prop_spec:
 
 simple_music_property_def:
        OVERRIDE context_prop_spec property_path '=' scalar {
-               $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),                  
+               $$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),
                                ly_symbol2scm ("OverrideProperty"),
                                scm_cadr ($2),
                                $5, SCM_UNDEFINED),
@@ -1282,13 +1441,27 @@ event_chord:
                i.set_location (@1, @2);
                $$ = MAKE_SYNTAX ("event-chord", i, elts);
        }
+       | CHORD_REPETITION optional_notemode_duration post_events {
+               Input i;
+               i.set_location (@1, @3);
+               $$ = MAKE_SYNTAX ("repetition-chord", i,
+                                 PARSER->lexer_->chord_repetition_.last_chord_,
+                                 PARSER->lexer_->chord_repetition_.repetition_function_,
+                                 $2, $3);
+       }
        | MULTI_MEASURE_REST optional_notemode_duration post_events {
                Input i;
                i.set_location (@1, @3);
                $$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
        }
        | command_element
-       | note_chord_element
+       /* note chord elements are memorized into
+          PARSER->lexer_->chord_repetition_ so that the chord repetition
+          mechanism copy them when a chord repetition symbol is found
+       */
+       | note_chord_element    {
+               PARSER->lexer_->chord_repetition_.last_chord_ = $$;
+       }
        ;
 
 
@@ -1299,7 +1472,7 @@ note_chord_element:
                SCM dur = unsmob_duration ($2)->smobbed_copy ();
                SCM es = m->get_property ("elements");
                SCM postevs = scm_reverse_x ($3, SCM_EOL);
-               
+
                for (SCM s = es; scm_is_pair (s); s = scm_cdr (s))
                  unsmob_music (scm_car (s))->set_property ("duration", dur);
                es = ly_append2 (es, postevs);
@@ -1362,7 +1535,7 @@ chord_body_element:
                }
                $$ = n->unprotect ();
        }
-       | music_function_chord_body { 
+       | music_function_chord_body {
                $$ = run_music_function (PARSER, $1);
        }
        ;
@@ -1471,7 +1644,7 @@ command_event:
 
                Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
                if (scm_ilength ($3) > 0)
-               {               
+               {
                        key->set_property ("pitch-alist", $3);
                        key->set_property ("tonic", Pitch (0, 0, 0).smobbed_copy ());
                        key->transpose (* unsmob_pitch ($2));
@@ -1493,7 +1666,7 @@ post_events:
                $$ = scm_cons ($2, $$);
        }
        ;
-       
+
 post_event:
        direction_less_event {
                $$ = $1;
@@ -1543,7 +1716,7 @@ direction_less_char:
                $$ = ly_symbol2scm ("bracketOpenSymbol");
        }
        | ']'  {
-               $$ = ly_symbol2scm ("bracketCloseSymbol"); 
+               $$ = ly_symbol2scm ("bracketCloseSymbol");
        }
        | '~'  {
                $$ = ly_symbol2scm ("tildeSymbol");
@@ -1594,8 +1767,8 @@ direction_less_event:
                a->set_property ("tremolo-type", scm_from_int ($1));
                $$ = a->unprotect ();
         }
-       ;       
-       
+       ;
+
 direction_reqd_event:
        gen_text_def {
                $$ = $1;
@@ -1877,6 +2050,10 @@ bass_figure:
                        {
                        m->set_property ("no-continuation", SCM_BOOL_T);
                        }
+               else if ($2 == ly_symbol2scm ("backslash"))
+                       {
+                       m->set_property ("augmented-slash", SCM_BOOL_T);
+                       }
        }
        ;
 
@@ -1891,6 +2068,9 @@ figured_bass_modification:
        | '/'           {
                $$ = ly_symbol2scm ("slash");
        }
+       | E_BACKSLASH {
+               $$ = ly_symbol2scm ("backslash");
+       }
        ;
 
 br_bass_figure:
@@ -1934,7 +2114,7 @@ simple_element:
                        n = MY_MAKE_MUSIC ("RestEvent", @$);
                else
                        n = MY_MAKE_MUSIC ("NoteEvent", @$);
-               
+
                n->set_property ("pitch", $1);
                n->set_property ("duration", $5);
 
@@ -1956,7 +2136,7 @@ simple_element:
                n->set_property ("duration", $2);
                n->set_property ("drum-type", $1);
 
-               $$ = n->unprotect ();           
+               $$ = n->unprotect ();
        }
        | RESTNAME optional_notemode_duration           {
                Music *ev = 0;
@@ -1966,7 +2146,7 @@ simple_element:
                  }
                else {
                        ev = MY_MAKE_MUSIC ("RestEvent", @$);
-               
+
                    }
                ev->set_property ("duration", $2);
                $$ = ev->unprotect ();
@@ -1985,7 +2165,7 @@ simple_element:
 simple_chord_elements:
        simple_element  {
                $$ = scm_list_1 ($1);
-       }       
+       }
        | new_chord {
                 if (!PARSER->lexer_->is_chord_state ())
                         PARSER->parser_error (@1, _ ("have to be in Chord mode for chords"));
@@ -1997,7 +2177,7 @@ simple_chord_elements:
                        unsmob_music (scm_car (s))->set_property ("duration", $2);
                }
                $$ = $1;
-       }       
+       }
        ;
 
 lyric_element:
@@ -2021,7 +2201,7 @@ new_chord:
 
 chord_items:
        /**/ {
-               $$ = SCM_EOL;           
+               $$ = SCM_EOL;
        }
        | chord_items chord_item {
                $$ = scm_cons ($2, $$);
@@ -2072,7 +2252,7 @@ step_number:
        | bare_unsigned CHORD_MINUS {
                $$ = make_chord_step ($1, FLAT_ALTERATION);
        }
-       ;       
+       ;
 
 /*
        UTILITIES
@@ -2144,7 +2324,7 @@ unsigned_number:
                $$ = $1;
        }
        ;
-       
+
 
 exclamations:
                { $$ = 0; }
@@ -2172,6 +2352,15 @@ lyric_markup:
        }
        ;
 
+full_markup_list:
+       MARKUPLINES
+               { PARSER->lexer_->push_markup_state (); }
+       markup_list {
+               $$ = $3;
+               PARSER->lexer_->pop_state ();
+       }
+       ;
+
 full_markup:
        MARKUP_IDENTIFIER {
                $$ = $1;
@@ -2185,8 +2374,8 @@ full_markup:
        ;
 
 markup_top:
-       markup_list { 
-               $$ = scm_list_2 (ly_lily_module_constant ("line-markup"),  $1); 
+       markup_list {
+               $$ = scm_list_2 (ly_lily_module_constant ("line-markup"),  $1);
        }
        | markup_head_1_list simple_markup      {
                $$ = scm_car (scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, scm_list_1 ($2)));
@@ -2203,12 +2392,15 @@ markup_list:
        | markup_braced_list {
                $$ = $1;
        }
+       | markup_command_list {
+               $$ = scm_list_1 ($1);
+       }
        ;
 
 markup_composed_list:
        markup_head_1_list markup_braced_list {
                $$ = scm_call_2 (ly_lily_module_constant ("map-markup-command-list"), $1, $2);
-               
+
        }
        ;
 
@@ -2228,6 +2420,24 @@ markup_braced_list_body:
        }
        ;
 
+markup_command_list:
+       MARKUP_LIST_HEAD_EMPTY  {
+               $$ = scm_list_1 ($1);
+       }
+       | MARKUP_LIST_HEAD_LIST0 markup_list    {
+               $$ = scm_list_2 ($1, $2);
+       }
+       | MARKUP_LIST_HEAD_SCM0 embedded_scm    {
+               $$ = scm_list_2 ($1, $2);
+       }
+       | MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list  {
+               $$ = scm_list_3 ($1, $2, $3);
+       }
+       | MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list        {
+               $$ = scm_list_4 ($1, $2, $3, $4);
+       }
+       ;
+
 markup_head_1_item:
        MARKUP_HEAD_MARKUP0     {
                $$ = scm_list_1 ($1);
@@ -2280,6 +2490,12 @@ simple_markup:
        | MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
                $$ = scm_list_3 ($1, $2, $3);
        }
+       | MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
+               $$ = scm_list_4 ($1, $2, $3, $4);
+       }
+       | MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup {
+               $$ = scm_list_5 ($1, $2, $3, $4, $5);
+       }
        | MARKUP_HEAD_EMPTY {
                $$ = scm_list_1 ($1);
        }
@@ -2290,7 +2506,7 @@ simple_markup:
                $$ = scm_list_3 ($1, $2, $3);
        }
        ;
-       
+
 markup:
        markup_head_1_list simple_markup        {
                SCM mapper = ly_lily_module_constant ("map-markup-command-list");
@@ -2345,7 +2561,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 
                *destination = def->self_scm ();
                def->unprotect ();
-               
+
                return CONTEXT_DEF_IDENTIFIER;
        } else if (unsmob_score (sid)) {
                Score *score = new Score (*unsmob_score (sid));
@@ -2370,7 +2586,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
        } else if (unsmob_output_def (sid)) {
                Output_def *p = unsmob_output_def (sid);
                p = p->clone ();
-       
+
                *destination = p->self_scm ();
                p->unprotect ();
                return OUTPUT_DEF_IDENTIFIER;
@@ -2381,7 +2597,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
                return MARKUP_IDENTIFIER;
        }
 
-       return -1;      
+       return -1;
 }
 
 SCM
@@ -2515,7 +2731,7 @@ make_music_relative (Pitch start, SCM music, Input loc)
 {
        Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc);
        relative->set_property ("element", music);
-       
+
        Music *m = unsmob_music (music);
        Pitch last = m->to_relative_octave (start);
        if (lily_1_8_relative)