X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=213f3ec53967486e6ea63e8563f44d7e20e5c603;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=5901962c861103b99f998e4aeb6f587cba532d54;hpb=5798a17d91c344a5d1518f7e552a340aa4570a77;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 5901962c86..213f3ec539 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 %{
 
+#define YYDEBUG 1
 #define YYERROR_VERBOSE 1
 #define YYPARSE_PARAM my_lily_parser
 #define YYLEX_PARAM my_lily_parser
@@ -74,13 +75,11 @@ using namespace std;
 #include "context-def.hh"
 #include "dimensions.hh"
 #include "file-path.hh"
-#include "input-smob.hh"
 #include "input.hh"
 #include "international.hh"
 #include "lily-guile.hh"
 #include "lily-lexer.hh"
 #include "lily-parser.hh"
-#include "lilypond-input-version.hh"
 #include "main.hh"
 #include "misc.hh"
 #include "music.hh"
@@ -108,7 +107,7 @@ using namespace std;
 
 %{
 
-#define MY_MAKE_MUSIC(x)  make_music_by_name (ly_symbol2scm (x))
+#define MY_MAKE_MUSIC(x, spot)  make_music_with_input (ly_symbol2scm (x), spot)
 
 /* ES TODO:
 - Don't use lily module, create a new module instead.
@@ -132,12 +131,12 @@ SCM get_next_unique_lyrics_context_id ();
 #endif
 
 
-
-SCM make_music_relative (Pitch start, SCM music);
+static Music *make_music_with_input (SCM name, Input where);
+SCM make_music_relative (Pitch start, SCM music, Input loc);
 SCM run_music_function (Lily_parser *, SCM expr);
 SCM get_first_context_id (SCM type, Music *m);
 SCM make_chord_elements (SCM pitch, SCM dur, SCM modification_list);
-SCM make_chord_step (int step, int alter);
+SCM make_chord_step (int step, Rational alter);
 SCM make_simple_markup (SCM a);
 bool is_duration (int t);
 bool is_regular_identifier (SCM id);
@@ -157,10 +156,10 @@ void set_music_properties (Music *p, SCM a);
 /* Keyword tokens with plain escaped name.  */
 %token ACCEPTS "\\accepts"
 %token ADDLYRICS "\\addlyrics"
-%token ADDQUOTE "\\addquote"
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
 %token BOOK "\\book"
+%token BOOKPART "\\bookpart"
 %token CHANGE "\\change"
 %token CHORDMODE "\\chordmode"
 %token CHORDS "\\chords"
@@ -184,6 +183,7 @@ 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"
@@ -206,7 +206,6 @@ void set_music_properties (Music *p, SCM a);
 %token TEMPO "\\tempo"
 %token TIMES "\\times"
 %token TRANSPOSE "\\transpose"
-%token TRANSPOSITION "\\transposition"
 %token TYPE "\\type"
 %token UNSET "\\unset"
 %token WITH "\\with"
@@ -251,13 +250,19 @@ If we give names, Bison complains.
 %token CHORDMODIFIERS
 %token LYRIC_MARKUP
 %token MULTI_MEASURE_REST
-%token SCM_T
 
 
 %token <i> DIGIT
 %token <i> E_UNSIGNED
 %token <i> UNSIGNED
 
+/* Artificial tokens, for more generic function syntax */
+%token <i> EXPECT_MARKUP;
+%token <i> EXPECT_MUSIC;
+%token <i> EXPECT_SCM;
+/* After the last argument. */
+%token <i> EXPECT_NO_MORE_ARGS;
+
 %token <scm> BOOK_IDENTIFIER
 %token <scm> CHORDMODIFIER_PITCH
 %token <scm> CHORD_MODIFIER
@@ -276,25 +281,16 @@ 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_FUNCTION_MARKUP 
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP 
-%token <scm> MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC 
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC 
-%token <scm> MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC 
-%token <scm> MUSIC_FUNCTION_MUSIC 
-%token <scm> MUSIC_FUNCTION_MUSIC_MUSIC 
-%token <scm> MUSIC_FUNCTION_SCM 
-%token <scm> MUSIC_FUNCTION_SCM_MUSIC 
-%token <scm> MUSIC_FUNCTION_SCM_MUSIC_MUSIC 
-%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC 
-%token <scm> MUSIC_FUNCTION_SCM_SCM 
-%token <scm> MUSIC_FUNCTION_SCM_SCM_MUSIC 
-%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM 
-%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC 
-%token <scm> MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC 
 %token <scm> MUSIC_IDENTIFIER
 %token <scm> NOTENAME_PITCH
 %token <scm> NUMBER_IDENTIFIER
@@ -302,7 +298,7 @@ If we give names, Bison complains.
 %token <scm> REAL
 %token <scm> RESTNAME
 %token <scm> SCM_IDENTIFIER
-%token <scm> SCM_T
+%token <scm> SCM_TOKEN
 %token <scm> SCORE_IDENTIFIER
 %token <scm> STRING
 %token <scm> STRING_IDENTIFIER
@@ -311,9 +307,11 @@ 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 <i> figured_bass_alteration
+%type <scm> figured_bass_alteration
 %type <i> dots
 %type <i> exclamations
 %type <i> optional_rest
@@ -363,9 +361,7 @@ If we give names, Bison complains.
 %type <scm> absolute_pitch
 %type <scm> assignment_id
 %type <scm> bare_number
-%type <scm> music_function_event
-%type <scm> music_function_chord_body
-%type <scm> music_function_musicless_prefix
+%type <scm> unsigned_number
 %type <scm> bass_figure
 %type <scm> figured_bass_modification
 %type <scm> br_bass_figure
@@ -387,6 +383,12 @@ 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
+%type <scm> function_arglist_nonmusic_last
+%type <scm> function_arglist_nonmusic
 %type <scm> identifier_init
 %type <scm> lilypond_header
 %type <scm> lilypond_header_body
@@ -396,6 +398,7 @@ If we give names, Bison complains.
 %type <scm> markup_braced_list
 %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
@@ -403,6 +406,9 @@ If we give names, Bison complains.
 %type <scm> mode_changing_head
 %type <scm> mode_changing_head_with_context
 %type <scm> multiplied_duration
+%type <scm> music_function_identifier_musicless_prefix
+%type <scm> music_function_event
+%type <scm> music_function_chord_body
 %type <scm> new_chord
 %type <scm> new_lyrics
 %type <scm> number_expression
@@ -417,6 +423,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 property_path_revved
 %type <scm> scalar
 %type <scm> script_abbreviation
 %type <scm> simple_chord_elements
@@ -428,7 +435,6 @@ If we give names, Bison complains.
 %type <scm> step_number
 %type <scm> step_numbers 
 %type <scm> string
-%type <scm> function_scm_argument
 
 %type <score> score_block
 %type <score> score_body
@@ -471,6 +477,12 @@ 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;
 		
@@ -484,6 +496,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);
 	}
@@ -504,14 +520,14 @@ toplevel_expression:
 	;
 
 embedded_scm:
-	SCM_T
+	SCM_TOKEN
 	| SCM_IDENTIFIER
 	;
 
 
 lilypond_header_body:
 	{
-		$$ = get_header(PARSER);
+		$$ = get_header (PARSER);
 		PARSER->lexer_->add_scope ($$);
 	}
 	| lilypond_header_body assignment  {
@@ -535,15 +551,6 @@ assignment_id:
 
 assignment:
 	assignment_id '=' identifier_init  {
-		if (! is_regular_identifier ($1))
-		{
-#if 0
-			/* no longer valid with dashes in \paper{} block. */ 
-			@1.warning (_ ("identifier should have alphabetic characters only"));
-#endif
-		}
-
-
 	        PARSER->lexer_->set_identifier ($1, $3);
 
 /*
@@ -567,6 +574,10 @@ identifier_init:
 		$$ = $1->self_scm ();
 		$1->unprotect ();
 	}
+	| bookpart_block {
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
 	| output_def {
 		$$ = $1->self_scm ();
 		$1->unprotect ();
@@ -616,11 +627,11 @@ context_def_spec_block:
 context_def_spec_body:
 	/**/ {
 		$$ = Context_def::make_scm ();
-		unsmob_context_def ($$)->set_spot (@$);
+		unsmob_context_def ($$)->origin ()->set_spot (@$);
 	}
 	| CONTEXT_DEF_IDENTIFIER {
 		$$ = $1;
-		unsmob_context_def ($$)->set_spot (@$);
+		unsmob_context_def ($$)->origin ()->set_spot (@$);
 	}
 	| context_def_spec_body GROBDESCRIPTIONS embedded_scm {
 		Context_def*td = unsmob_context_def ($$);
@@ -652,26 +663,44 @@ book_block:
 book_body:
 	{
 		$$ = new Book;
-		$$->set_spot (@$);
+		$$->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"); 
 	}
 	| BOOK_IDENTIFIER {
 		$$ = unsmob_book ($1);
-		$$->set_spot (@$);
+		$$->protect ();
+		$$->origin ()->set_spot (@$);
 	}
 	| book_body paper_block {
 		$$->paper_ = $2;
 		$2->unprotect ();
 	}
+	| 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;
@@ -679,12 +708,64 @@ 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;
+	}
+	;
+
+bookpart_body:
+	{
+		$$ = new Book;
+		$$->origin ()->set_spot (@$);
+	}
+	| BOOK_IDENTIFIER {
+		$$ = unsmob_book ($1);
+		$$->protect ();
+		$$->origin ()->set_spot (@$);
+	}
+	| 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;
@@ -700,17 +781,18 @@ score_body:
 		// pass ownernship to C++ again.
 		$$ = unsmob_score (score);
 		$$->protect ();
-		$$->set_spot (@$);
+		$$->origin ()->set_spot (@$);
 	}
 	| SCORE_IDENTIFIER {
 		$$ = unsmob_score ($1);
-		$$->set_spot (@$);
+		$$->protect ();
+		$$->origin ()->set_spot (@$);
 	}
 	| score_body object_id_setting {
 		$$->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)
@@ -740,6 +822,7 @@ paper_block:
 		if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
 		{
 			PARSER->parser_error (@1, _ ("need \\paper for paper block"));
+			$1->unprotect ();
 			$$ = get_paper (PARSER);
 		}
 	}
@@ -788,9 +871,11 @@ output_def_body:
 	}
 	| output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER 	{
 		$1->unprotect ();
+
 		Output_def *o = unsmob_output_def ($3);
 		o->input_origin_.set_spot (@$);
 		$$ = o;
+		$$->protect ();
 		PARSER->lexer_->remove_scope ();
 		PARSER->lexer_->add_scope (o->scope_);
 	}
@@ -800,15 +885,6 @@ output_def_body:
 	| output_def_body context_def_spec_block	{
 		assign_context_def ($$, $2);
 	}
-	| output_def_body tempo_event  {
-		/*
-			junk this ? there already is tempo stuff in
-			music.
-		*/
-		int m = scm_to_int (unsmob_music($2)->get_property ("metronome-count"));
-		Duration *d = unsmob_duration (unsmob_music($2)->get_property ("tempo-unit"));
-		set_tempo ($$, d->get_length (), m);
-	}
 	| output_def_body error {
 
 	}
@@ -816,10 +892,19 @@ output_def_body:
 
 tempo_event:
 	TEMPO steno_duration '=' bare_unsigned	{
-		Music *m = MY_MAKE_MUSIC ("MetronomeChangeEvent");
-		m->set_property ("tempo-unit", $2);
-		m->set_property ("metronome-count", scm_from_int ( $4));
-		$$ = m->unprotect ();
+		$$ = 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 );
 	}
 	;
 
@@ -848,7 +933,7 @@ music_list:
 
 	}
 	| music_list error {
-		Music *m = MY_MAKE_MUSIC("Music");
+		Music *m = MY_MAKE_MUSIC("Music", @$);
 		// ugh. code dup 
 		m->set_property ("error-found", SCM_BOOL_T);
 		SCM s = $$;
@@ -879,9 +964,9 @@ alternative_music:
 
 
 repeated_music:
-	REPEAT simple_string bare_unsigned music alternative_music
+	REPEAT simple_string unsigned_number music alternative_music
 	{
-		$$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5);
+		$$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5);
 	}
 	;
 
@@ -942,48 +1027,52 @@ function_scm_argument:
 	| simple_string
 	;
 
-/*
-TODO: use code generation for this
-*/
-generic_prefix_music_scm:
-	MUSIC_FUNCTION {
-		$$ = scm_list_2 ($1, make_input (@$));
-	}
-	| MUSIC_FUNCTION_SCM function_scm_argument {
-		$$ = scm_list_3 ($1, make_input (@$), $2);
-	}
-	| MUSIC_FUNCTION_MARKUP full_markup {
-		$$ = scm_list_3 ($1, make_input (@$), $2);
-	}
-	| music_function_musicless_prefix music {
-		$$ = ly_append2 ($1, scm_list_1 ($2));
-	}
-	| MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument {
-		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
+/* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence:
+ MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM
+and this rule returns the reversed list of arguments. */
+
+function_arglist_music_last:
+	EXPECT_MUSIC function_arglist music {
+		$$ = scm_cons ($3, $2);
 	}
-	| MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument {
-		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+	;
+
+function_arglist_nonmusic_last:
+	EXPECT_MARKUP function_arglist full_markup {
+		$$ = scm_cons ($3, $2);
 	}
-	| MUSIC_FUNCTION_MARKUP_MUSIC full_markup music {
-		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
+	| EXPECT_SCM function_arglist function_scm_argument {
+		$$ = scm_cons ($3, $2);
 	}
-	| MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
-		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
+	;
+
+function_arglist_nonmusic: EXPECT_NO_MORE_ARGS {
+		$$ = SCM_EOL;
 	}
-	| MUSIC_FUNCTION_MUSIC_MUSIC music music {
-		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
+	| EXPECT_MARKUP function_arglist_nonmusic full_markup {
+		$$ = scm_cons ($3, $2);
 	}
-	| MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument music music {
-		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+	| EXPECT_SCM function_arglist_nonmusic function_scm_argument {
+		$$ = scm_cons ($3, $2);
 	}
-	| MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC function_scm_argument function_scm_argument music music {
-		$$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED);
+	;
+
+function_arglist: EXPECT_NO_MORE_ARGS {
+		/* This is for 0-ary functions, so they don't need to
+		   read a lookahead token */
+		$$ = SCM_EOL;
 	}
-	| MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup music music {
-		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+	| function_arglist_music_last
+	| function_arglist_nonmusic_last
+	;
+
+generic_prefix_music_scm:
+	MUSIC_FUNCTION function_arglist {
+		$$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
 	}
 	;
 
+
 optional_id:
 	/**/ { $$ = SCM_EOL; }
 	| '=' simple_string {
@@ -996,7 +1085,7 @@ prefix_composite_music:
 	generic_prefix_music_scm {
 		$$ = run_music_function (PARSER, $1);
 	}
-	| CONTEXT    simple_string optional_id optional_context_mod music {
+	| CONTEXT simple_string optional_id optional_context_mod music {
 		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F);
 	}
 	| NEWCONTEXT simple_string optional_id optional_context_mod music {
@@ -1098,11 +1187,11 @@ mode_changing_head_with_context:
 relative_music:
 	RELATIVE absolute_pitch music {
 		Pitch start = *unsmob_pitch ($2);
-		$$ = make_music_relative (start, $3);
+		$$ = make_music_relative (start, $3, @$);
 	}
 	| RELATIVE composite_music {
 		Pitch middle_c (0, 0, 0);
-		$$ = make_music_relative (middle_c, $2);
+		$$ = make_music_relative (middle_c, $2, @$);
 	}
 	;
 
@@ -1142,6 +1231,22 @@ context_change:
 	}
 	;
 
+
+property_path_revved:
+	embedded_scm {
+		$$ = scm_cons ($1, SCM_EOL);
+	}
+	| 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"),
@@ -1151,13 +1256,10 @@ property_operation:
 		$$ = scm_list_2 (ly_symbol2scm ("unset"),
 			scm_string_to_symbol ($2));
 	}
-	| OVERRIDE simple_string embedded_scm '=' embedded_scm {
-		$$ = scm_list_4 (ly_symbol2scm ("push"),
-			scm_string_to_symbol ($2), $5, $3);
-	}
-	| OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm {
-		$$ = scm_list_5 (ly_symbol2scm ("push"),
-				scm_string_to_symbol ($2), $6, $4, $3);
+	| OVERRIDE simple_string property_path '=' embedded_scm {
+		$$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
+							scm_string_to_symbol ($2), $5),
+					     $3));
 	}
 	| REVERT simple_string embedded_scm {
 		$$ = scm_list_3 (ly_symbol2scm ("pop"),
@@ -1203,17 +1305,12 @@ context_prop_spec:
 	;
 
 simple_music_property_def:
-	OVERRIDE context_prop_spec embedded_scm '=' scalar {
-		$$ = scm_list_5 (scm_car ($2),
-			ly_symbol2scm ("OverrideProperty"),
-			scm_cadr ($2),
-			$5, $3);
-	}
-	| OVERRIDE context_prop_spec embedded_scm  embedded_scm '=' scalar {
-		$$ = scm_list_n (scm_car ($2),			
-			ly_symbol2scm ("OverrideProperty"),
-			scm_cadr ($2),
-			$6, $4, $3, SCM_UNDEFINED);
+	OVERRIDE context_prop_spec property_path '=' scalar {
+		$$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),			
+				ly_symbol2scm ("OverrideProperty"),
+				scm_cadr ($2),
+				$5, SCM_UNDEFINED),
+				$3));
 	}
 	| REVERT context_prop_spec embedded_scm {
 		$$ = scm_list_4 (scm_car ($2),
@@ -1349,9 +1446,8 @@ chord_body_element:
 		SCM check = $4;
 		SCM post = $5;
 
-		Music *n = MY_MAKE_MUSIC ("NoteEvent");
+		Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
 		n->set_property ("pitch", $1);
-		n->set_spot (@$);
 		if (q % 2)
 			n->set_property ("cautionary", SCM_BOOL_T);
 		if (ex % 2 || q % 2)
@@ -1370,10 +1466,9 @@ chord_body_element:
 		$$ = n->unprotect ();
 	}
 	| DRUM_PITCH post_events {
-		Music *n = MY_MAKE_MUSIC ("NoteEvent");
+		Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
 		n->set_property ("duration", $2);
 		n->set_property ("drum-type", $1);
-		n->set_spot (@$);
 
 		if (scm_is_pair ($2)) {
 			SCM arts = scm_reverse_x ($2, SCM_EOL);
@@ -1386,43 +1481,39 @@ chord_body_element:
 	}
 	;
 
-music_function_chord_body:
-	MUSIC_FUNCTION {
-		$$ = scm_list_2 ($1, make_input (@$));
-	}
-	| music_function_musicless_prefix chord_body_element {
-		$$ = ly_append2 ($1, scm_list_1 ($2));
+music_function_identifier_musicless_prefix: MUSIC_FUNCTION {
+		SCM sig = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature"));
+		if (scm_is_pair (sig) && to_boolean (scm_memq (ly_music_p_proc, scm_cdr (scm_reverse (sig)))))
+		{
+			PARSER->parser_error (@$, "Music function applied to event may not have a Music argument, except as the last argument.");
+		}
 	}
 	;
 
-music_function_event:
-	music_function_musicless_prefix post_event {
-		$$ = ly_append2 ($1, scm_list_1 ($2));
+music_function_chord_body:
+	/* We could allow chord functions to have multiple music arguments,
+	   but it's more consistent with music_function_event if we
+	   prohibit it here too */
+	music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic chord_body_element {
+		$$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4)));
+	}
+	| music_function_identifier_musicless_prefix function_arglist_nonmusic {
+		$$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
 	}
 	;
 
-/*
-TODO: use code generation for this
-*/
-music_function_musicless_prefix:
-	MUSIC_FUNCTION_MUSIC {
-		$$ = scm_list_2 ($1, make_input (@$));
-	}
-	| MUSIC_FUNCTION_SCM_MUSIC function_scm_argument { 
-		$$ = scm_list_3 ($1, make_input (@$), $2);
-	}
-	| MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument {
-		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
-	}
-	| MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument {
-		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
+music_function_event:
+	/* Post-events can only have the last argument as music, without this
+	   restriction we get a shift/reduce conflict from e.g.
+	   c8-\partcombine c8 -. */
+	music_function_identifier_musicless_prefix EXPECT_MUSIC function_arglist_nonmusic post_event {
+		$$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($3, scm_list_1 ($4)));
 	}
-	| MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC function_scm_argument function_scm_argument function_scm_argument function_scm_argument {
-		$$ = scm_list_n ($1, make_input (@$), $2, $3, $4, $5, SCM_UNDEFINED);
+	| music_function_identifier_musicless_prefix function_arglist_nonmusic {
+		$$ = ly_append2 (scm_list_2 ($1, make_input (@$)), scm_reverse_x ($2, SCM_EOL));
 	}
 	;
 
-
 command_element:
 	command_event {
 		$$ = $1;
@@ -1431,15 +1522,13 @@ command_element:
 		$$ = MAKE_SYNTAX ("skip-music", @$, $2);
 	}
 	| E_BRACKET_OPEN {
-		Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+		Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
 		m->set_property ("span-direction", scm_from_int (START));
-		m->set_spot (@$);
 		$$ = m->unprotect();
 	}
 	| E_BRACKET_CLOSE {
-		Music *m = MY_MAKE_MUSIC ("LigatureEvent");
+		Music *m = MY_MAKE_MUSIC ("LigatureEvent", @$);
 		m->set_property ("span-direction", scm_from_int (STOP));
-		m->set_spot (@$);
 		$$ = m->unprotect ();
 	}
 	| E_BACKSLASH {
@@ -1459,11 +1548,6 @@ command_element:
 			$$ = MAKE_SYNTAX ("bar-check", @$, SCM_UNDEFINED);
 
 	}
-	| TRANSPOSITION pitch {
-		Pitch middle_c;
-		Pitch sounds_as_c = pitch_interval (*unsmob_pitch ($2), middle_c);
-		$$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Staff"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("instrumentTransposition"), sounds_as_c.smobbed_copy ());
-	}
 	| PARTIAL duration_length	{
 		Moment m = - unsmob_duration ($2)->get_length ();
 		$$ = MAKE_SYNTAX ("property-operation", @$, SCM_BOOL_F, ly_symbol2scm ("Timing"), ly_symbol2scm ("PropertySet"), ly_symbol2scm ("measurePosition"), m.smobbed_copy ());
@@ -1484,22 +1568,22 @@ command_element:
 
 command_event:
 	E_TILDE {
-		$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent")->unprotect ();
+		$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect ();
 	}
 	| MARK DEFAULT  {
-		Music *m = MY_MAKE_MUSIC ("MarkEvent");
+		Music *m = MY_MAKE_MUSIC ("MarkEvent", @$);
 		$$ = m->unprotect ();
 	}
 	| tempo_event {
 		$$ = $1;
 	}
 	| KEY DEFAULT {
-		Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
+		Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
 		$$ = key->unprotect ();
 	}
 	| KEY NOTENAME_PITCH SCM_IDENTIFIER 	{
 
-		Music *key = MY_MAKE_MUSIC ("KeyChangeEvent");
+		Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
 		if (scm_ilength ($3) > 0)
 		{		
 			key->set_property ("pitch-alist", $3);
@@ -1534,12 +1618,12 @@ post_event:
 	| HYPHEN {
 		if (!PARSER->lexer_->is_lyric_state ())
 			PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
-		$$ = MY_MAKE_MUSIC ("HyphenEvent")->unprotect ();
+		$$ = MY_MAKE_MUSIC ("HyphenEvent", @$)->unprotect ();
 	}
 	| EXTENDER {
 		if (!PARSER->lexer_->is_lyric_state ())
 			PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
-		$$ = MY_MAKE_MUSIC ("ExtenderEvent")->unprotect ();
+		$$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect ();
 	}
 	| script_dir direction_reqd_event {
 		if ($1)
@@ -1562,9 +1646,8 @@ post_event:
 
 string_number_event:
 	E_UNSIGNED {
-		Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
+		Music *s = MY_MAKE_MUSIC ("StringNumberEvent", @$);
 		s->set_property ("string-number", scm_from_int ($1));
-		s->set_spot (@$);
 		$$ = s->unprotect ();
 	}
 	;
@@ -1609,20 +1692,19 @@ direction_less_event:
 		if (unsmob_music (predefd))
 		{
 			m = unsmob_music (predefd)->clone ();
+			m->set_spot (@$);
 		}
 		else
 		{
-			m = MY_MAKE_MUSIC ("Music");
+			m = MY_MAKE_MUSIC ("Music", @$);
 		}
-		m->set_spot (@$);
 		$$ = m->unprotect ();
 	}
 	| EVENT_IDENTIFIER	{
 		$$ = $1;
 	}
 	| tremolo_type  {
-               Music *a = MY_MAKE_MUSIC ("TremoloEvent");
-               a->set_spot (@$);
+               Music *a = MY_MAKE_MUSIC ("TremoloEvent", @$);
                a->set_property ("tremolo-type", scm_from_int ($1));
                $$ = a->unprotect ();
         }
@@ -1634,7 +1716,7 @@ direction_reqd_event:
 	}
 	| script_abbreviation {
 		SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
-		Music *a = MY_MAKE_MUSIC ("ArticulationEvent");
+		Music *a = MY_MAKE_MUSIC ("ArticulationEvent", @$);
 		if (scm_is_string (s))
 			a->set_property ("articulation-type", s);
 		else PARSER->parser_error (@1, _ ("expecting string as script definition"));
@@ -1645,7 +1727,7 @@ direction_reqd_event:
 octave_check:
 	/**/ { $$ = SCM_EOL; }
 	| '='  { $$ = scm_from_int (0); }
-	| '=' sub_quotes { $$ = scm_from_int ($2); }
+	| '=' sub_quotes { $$ = scm_from_int (-$2); }
 	| '=' sup_quotes { $$ = scm_from_int ($2); }
 	;
 
@@ -1697,7 +1779,7 @@ steno_tonic_pitch:
 		$$ = p.smobbed_copy ();
 	}
 	| TONICNAME_PITCH sub_quotes	 {
-		Pitch p =* unsmob_pitch ($1);
+		Pitch p = *unsmob_pitch ($1);
 
 		p = p.transposed (Pitch (-$2,0,0));
 		$$ = p.smobbed_copy ();
@@ -1717,47 +1799,44 @@ pitch_also_in_chords:
 
 gen_text_def:
 	full_markup {
-		Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+		Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
 		t->set_property ("text", $1);
-		t->set_spot (@$);
 		$$ = t->unprotect ();
 	}
 	| string {
-		Music *t = MY_MAKE_MUSIC ("TextScriptEvent");
+		Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
 		t->set_property ("text",
 			make_simple_markup ($1));
-		t->set_spot (@$);
 		$$ = t->unprotect ();
 	}
 	| DIGIT {
-		Music *t = MY_MAKE_MUSIC ("FingerEvent");
+		Music *t = MY_MAKE_MUSIC ("FingeringEvent", @$);
 		t->set_property ("digit", scm_from_int ($1));
-		t->set_spot (@$);
 		$$ = t->unprotect ();
 	}
 	;
 
 script_abbreviation:
 	'^'		{
-		$$ = scm_makfrom0str ("Hat");
+		$$ = scm_from_locale_string ("Hat");
 	}
 	| '+'		{
-		$$ = scm_makfrom0str ("Plus");
+		$$ = scm_from_locale_string ("Plus");
 	}
 	| '-' 		{
-		$$ = scm_makfrom0str ("Dash");
+		$$ = scm_from_locale_string ("Dash");
 	}
  	| '|'		{
-		$$ = scm_makfrom0str ("Bar");
+		$$ = scm_from_locale_string ("Bar");
 	}
 	| ANGLE_CLOSE	{
-		$$ = scm_makfrom0str ("Larger");
+		$$ = scm_from_locale_string ("Larger");
 	}
 	| '.' 		{
-		$$ = scm_makfrom0str ("Dot");
+		$$ = scm_from_locale_string ("Dot");
 	}
 	| '_' {
-		$$ = scm_makfrom0str ("Underscore");
+		$$ = scm_from_locale_string ("Underscore");
 	}
 	;
 
@@ -1862,20 +1941,18 @@ bass_number:
 	;
 
 figured_bass_alteration:
-	'-' 	{ $$ = -2; }
-	| '+'	{ $$ = 2; }
-	| '!'	{ $$ = 0; }
+	'-' 	{ $$ = ly_rational2scm (FLAT_ALTERATION); }
+	| '+'	{ $$ = ly_rational2scm (SHARP_ALTERATION); }
+	| '!'	{ $$ = scm_from_int (0); }
 	;
 
 bass_figure:
 	FIGURE_SPACE {
-		Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
-		$$ = bfr->self_scm ();
-		bfr->unprotect ();
-		bfr->set_spot (@1);
+		Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$);
+		$$ = bfr->unprotect ();
 	}
 	| bass_number  {
-		Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
+		Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent", @$);
 		$$ = bfr->self_scm ();
 
 		if (scm_is_number ($1))
@@ -1884,7 +1961,6 @@ bass_figure:
 			bfr->set_property ("text", $1);
 
 		bfr->unprotect ();
-		bfr->set_spot (@1);
 	}
 	| bass_figure ']' {
 		$$ = $1;
@@ -1892,11 +1968,11 @@ bass_figure:
 	}
 	| bass_figure figured_bass_alteration {
 		Music *m = unsmob_music ($1);
-		if ($2) {
+		if (scm_to_double ($2)) {
 			SCM salter = m->get_property ("alteration");
-			int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
+			SCM alter = scm_is_number (salter) ? salter : scm_from_int (0);
 			m->set_property ("alteration",
-				scm_from_int (alter + $2));
+					 scm_sum (alter, $2));
 		} else {
 			m->set_property ("alteration", scm_from_int (0));
 		}
@@ -1915,6 +1991,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);
+			}
 	}
 	;
 
@@ -1929,6 +2009,9 @@ figured_bass_modification:
 	| '/'		{
 		$$ = ly_symbol2scm ("slash");
 	}
+	| E_BACKSLASH {
+		$$ = ly_symbol2scm ("backslash");
+	}
 	;
 
 br_bass_figure:
@@ -1969,9 +2052,9 @@ simple_element:
 
 		Music *n = 0;
 		if ($6)
-			n = MY_MAKE_MUSIC ("RestEvent");
+			n = MY_MAKE_MUSIC ("RestEvent", @$);
 		else
-			n = MY_MAKE_MUSIC ("NoteEvent");
+			n = MY_MAKE_MUSIC ("NoteEvent", @$);
 		
 		n->set_property ("pitch", $1);
 		n->set_property ("duration", $5);
@@ -1987,11 +2070,10 @@ simple_element:
 		if ($2 % 2 || $3 % 2)
 			n->set_property ("force-accidental", SCM_BOOL_T);
 
-		n->set_spot (@$);
 		$$ = n->unprotect ();
 	}
 	| DRUM_PITCH optional_notemode_duration {
-		Music *n = MY_MAKE_MUSIC ("NoteEvent");
+		Music *n = MY_MAKE_MUSIC ("NoteEvent", @$);
 		n->set_property ("duration", $2);
 		n->set_property ("drum-type", $1);
 
@@ -2001,24 +2083,22 @@ simple_element:
 		Music *ev = 0;
  		if (ly_scm2string ($1) == "s") {
 			/* Space */
-			ev = MY_MAKE_MUSIC ("SkipEvent");
+			ev = MY_MAKE_MUSIC ("SkipEvent", @$);
 		  }
 		else {
-			ev = MY_MAKE_MUSIC ("RestEvent");
+			ev = MY_MAKE_MUSIC ("RestEvent", @$);
 		
 		    }
 		ev->set_property ("duration", $2);
-		ev->set_spot (@$);
  		$$ = ev->unprotect ();
 	}
 	| lyric_element optional_notemode_duration 	{
 		if (!PARSER->lexer_->is_lyric_state ())
 			PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
 
-		Music *levent = MY_MAKE_MUSIC ("LyricEvent");
+		Music *levent = MY_MAKE_MUSIC ("LyricEvent", @$);
 		levent->set_property ("text", $1);
 		levent->set_property ("duration",$2);
-		levent->set_spot (@$);
 		$$= levent->unprotect ();
 	}
 	;
@@ -2108,10 +2188,10 @@ step_number:
 		$$ = make_chord_step ($1, 0);
         }
 	| bare_unsigned '+' {
-		$$ = make_chord_step ($1, SHARP);
+		$$ = make_chord_step ($1, SHARP_ALTERATION);
 	}
 	| bare_unsigned CHORD_MINUS {
-		$$ = make_chord_step ($1, FLAT);
+		$$ = make_chord_step ($1, FLAT_ALTERATION);
 	}
 	;	
 
@@ -2179,6 +2259,14 @@ bare_unsigned:
 	}
 	;
 
+unsigned_number:
+	bare_unsigned  { $$ = scm_from_int ($1); }
+	| NUMBER_IDENTIFIER {
+		$$ = $1;
+	}
+	;
+	
+
 exclamations:
 		{ $$ = 0; }
 	| exclamations '!'	{ $$ ++; }
@@ -2205,6 +2293,15 @@ lyric_markup:
 	}
 	;
 
+full_markup_list:
+	MARKUPLINES
+		{ PARSER->lexer_->push_markup_state (); }
+	markup_list {
+		$$ = $3;
+		PARSER->lexer_->pop_state ();
+	}
+	;
+
 full_markup:
 	MARKUP_IDENTIFIER {
 		$$ = $1;
@@ -2236,6 +2333,9 @@ markup_list:
 	| markup_braced_list {
 		$$ = $1;
 	}
+	| markup_command_list {
+		$$ = scm_list_1 ($1);
+	}
 	;
 
 markup_composed_list:
@@ -2261,6 +2361,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);
@@ -2313,6 +2431,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);
 	}
@@ -2337,11 +2461,9 @@ markup:
 %%
 
 void
-Lily_parser::set_yydebug (bool )
+Lily_parser::set_yydebug (bool x)
 {
-#if 0
-	yydebug = 1;
-#endif
+	yydebug = x;
 }
 
 void
@@ -2367,17 +2489,26 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		*destination = sid;
 		return STRING_IDENTIFIER;
 	} else if (unsmob_book (sid)) {
-		*destination = unsmob_book (sid)->clone ()->self_scm ();
+		Book *book =  unsmob_book (sid)->clone ();
+		*destination = book->self_scm ();
+		book->unprotect ();
+
 		return BOOK_IDENTIFIER;
 	} else if (scm_is_number (sid)) {
 		*destination = sid;
 		return NUMBER_IDENTIFIER;
 	} else if (unsmob_context_def (sid)) {
-		*destination = unsmob_context_def (sid)->clone_scm ();
+		Context_def *def= unsmob_context_def (sid)->clone ();
+
+		*destination = def->self_scm ();
+		def->unprotect ();
+		
 		return CONTEXT_DEF_IDENTIFIER;
 	} else if (unsmob_score (sid)) {
 		Score *score = new Score (*unsmob_score (sid));
 		*destination = score->self_scm ();
+
+		score->unprotect ();
 		return SCORE_IDENTIFIER;
 	} else if (Music *mus = unsmob_music (sid)) {
 		mus = mus->clone ();
@@ -2388,6 +2519,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
 			!= SCM_BOOL_F;
 
+		mus->unprotect ();
 		return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
 	} else if (unsmob_duration (sid)) {
 		*destination = unsmob_duration (sid)->smobbed_copy ();
@@ -2395,8 +2527,9 @@ 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;
 	} else if (Text_interface::is_markup (sid)) {
 		*destination = sid;
@@ -2411,7 +2544,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 SCM
 get_next_unique_context_id ()
 {
-	return scm_makfrom0str ("$uniqueContextId");
+	return scm_from_locale_string ("$uniqueContextId");
 }
 
 
@@ -2421,7 +2554,7 @@ get_next_unique_lyrics_context_id ()
 	static int new_context_count;
 	char s[128];
 	snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++);
-	return scm_makfrom0str (s);
+	return scm_from_locale_string (s);
 }
 
 
@@ -2464,6 +2597,13 @@ is_regular_identifier (SCM id)
   return v;
 }
 
+Music *
+make_music_with_input (SCM name, Input where)
+{
+       Music *m = make_music_by_name (name);
+       m->set_spot (where);
+       return m;
+}
 
 SCM
 get_first_context_id (SCM type, Music *m)
@@ -2494,15 +2634,15 @@ void
 set_music_properties (Music *p, SCM a)
 {
   for (SCM k = a; scm_is_pair (k); k = scm_cdr (k))
- 	p->internal_set_property (scm_caar (k), scm_cdar (k));
+ 	p->set_property (scm_caar (k), scm_cdar (k));
 }
 
 
 SCM
-make_chord_step (int step, int alter)
+make_chord_step (int step, Rational alter)
 {
 	if (step == 7)
-		alter += FLAT;
+		alter += FLAT_ALTERATION;
 
 	while (step < 0)
 		step += 7;
@@ -2528,9 +2668,9 @@ ly_input_procedure_p (SCM x)
 }
 
 SCM
-make_music_relative (Pitch start, SCM music)
+make_music_relative (Pitch start, SCM music, Input loc)
 {
-	Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
+	Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic", loc);
  	relative->set_property ("element", music);
 	
 	Music *m = unsmob_music (music);