X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=22a45b279786e62e8fc0d5156d4b5647634fcc2e;hb=252ec5e71b5e121734a9c9897245137cb07e4a1f;hp=67196eec112bfe14777168c9c43e910ad697865a;hpb=4d3a8ac41c2a1e87e063301d386d2c69db7c54af;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 67196eec11..22a45b2797 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1,7 +1,8 @@
+/* -*- mode: c++; c-file-style: "linux" -*- */
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -18,15 +19,20 @@
   along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+/* Mode and indentation are at best a rough approximation based on TAB
+ * formatting (reasonable for compatibility with unspecific editor
+ * modes as Bison modes are hard to find) and need manual correction
+ * frequently.  Without a reasonably dependable way of formatting a
+ * Bison file sensibly, there is little point in trying to fix the
+ * inconsistent state of indentation.
+ */
+
 %{
 
 #define YYDEBUG 1
 #define YYERROR_VERBOSE 1
-#define YYPARSE_PARAM my_lily_parser
-#define YYLEX_PARAM my_lily_parser
-#define PARSER ((Lily_parser *) my_lily_parser)
 
-#define yyerror PARSER->parser_error
+#define yyerror Lily_parser::parser_error
 
 /* We use custom location type: Input objects */
 #define YYLTYPE Input
@@ -36,8 +42,11 @@
 
 %}
 
+%parse-param {Lily_parser *parser}
+%lex-param {Lily_parser *parser}
+
 /* We use SCMs to do strings, because it saves us the trouble of
-deleting them.  Let's hope that a stack overflow doesnt trigger a move
+deleting them.  Let's hope that a stack overflow doesn't trigger a move
 of the parse stack onto the heap. */
 
 %left PREC_BOT
@@ -59,24 +68,33 @@ or
 %nonassoc COMPOSITE
 %left ADDLYRICS
 
- /* ADDLYRICS needs to have lower precedence than FUNCTION_ARGUMENTS,
+ /* ADDLYRICS needs to have lower precedence than argument scanning,
   * or we won't be able to tell music apart from closed_music without
   * lookahead in the context of function calls.
   */
 
-%right FUNCTION_ARGUMENTS
-      MARKUP LYRICS_STRING MARKUP_IDENTIFIER STRING STRING_IDENTIFIER
-      MARKUPLIST WITH CONTEXT_MOD_IDENTIFIER MARKUPLIST_IDENTIFIER
-      SCORE BOOK BOOKPART PAPER LAYOUT MIDI
-      SEQUENTIAL SIMULTANEOUS DOUBLE_ANGLE_OPEN MUSIC_IDENTIFIER '{'
-      PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
-      SCM_FUNCTION SCM_IDENTIFIER SCM_TOKEN
-      UNSIGNED DURATION_IDENTIFIER
-      CHORDMODE CHORDS DRUMMODE DRUMS FIGUREMODE FIGURES LYRICMODE LYRICS
-      NOTEMODE
-      CONTEXT TIMES NEWCONTEXT
+%nonassoc DEFAULT
+
+ /* \default is only applied after exhausting function arguments */
+
+%nonassoc FUNCTION_ARGLIST
+
+ /* expressions with units are permitted into argument lists */
 
- /* The above are the symbols that can start function arguments */
+%right PITCH_IDENTIFIER NOTENAME_PITCH TONICNAME_PITCH
+      UNSIGNED REAL DURATION_IDENTIFIER ':'
+
+ /* The above are the symbols that can start optional function arguments
+    that are recognized in the grammar rather than by predicate
+ */
+
+%nonassoc NUMBER_IDENTIFIER '/'
+
+ /* Number-unit expressions, where permitted, are concatenated into
+  * function arguments, just like fractions and tremoli.  Tremoli must
+  * not have higher precedence than UNSIGNED, or Lilypond will not
+  * join ':' with a following optional number.
+  */
 
 %left PREC_TOP
 
@@ -126,14 +144,38 @@ using namespace std;
 #include "text-interface.hh"
 #include "warn.hh"
 
+void
+Lily_parser::parser_error (Input const *i, Lily_parser *parser, string s)
+{
+	parser->parser_error (*i, s);
+}
+
 #define MYBACKUP(Token, Value, Location)				\
-	do								\
-		if (yychar == YYEMPTY)					\
-			PARSER->lexer_->push_extra_token (Token, Value); \
-		else							\
-			PARSER->parser_error				\
-				(Location, _("cannot backup token"));	\
-	while (0)
+do									\
+	if (yychar == YYEMPTY)						\
+	{								\
+		if (Token)						\
+			parser->lexer_->push_extra_token (Token, Value); \
+		parser->lexer_->push_extra_token (BACKUP);		\
+	} else {							\
+		parser->parser_error					\
+			(Location, _("Too much lookahead"));		\
+	}								\
+while (0)
+
+
+#define MYREPARSE(Location, Pred, Token, Value)				\
+do									\
+	if (yychar == YYEMPTY)						\
+	{								\
+		parser->lexer_->push_extra_token (Token, Value);	\
+		parser->lexer_->push_extra_token (REPARSE,		\
+						  Pred);		\
+	} else {							\
+		parser->parser_error					\
+			(Location, _("Too much lookahead"));		\
+	}								\
+while (0)
 
 %}
 
@@ -143,7 +185,6 @@ using namespace std;
 	Output_def *outputdef;
 	SCM scm;
 	std::string *string;
- 	Music *music;
  	Score *score;
  	int i;
 }
@@ -160,11 +201,11 @@ using namespace std;
   scm_apply_0 (proc, args)
 /* Syntactic Sugar. */
 #define MAKE_SYNTAX(name, location, ...)	\
-  LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (PARSER->self_scm (), make_input (location), ##__VA_ARGS__, SCM_UNDEFINED));
+  LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant (name), scm_list_n (parser->self_scm (), make_input (location) , ##__VA_ARGS__, SCM_UNDEFINED))
 #define START_MAKE_SYNTAX(name, ...)					\
-	scm_list_n (ly_lily_module_constant (name), ##__VA_ARGS__, SCM_UNDEFINED)
+	scm_list_n (ly_lily_module_constant (name) , ##__VA_ARGS__, SCM_UNDEFINED)
 #define FINISH_MAKE_SYNTAX(start, location, ...)			\
-	LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (PARSER->self_scm (), make_input (location), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))))
+	LOWLEVEL_MAKE_SYNTAX (scm_car (start), scm_cons2 (parser->self_scm (), make_input (location), scm_append_x (scm_list_2 (scm_cdr (start), scm_list_n (__VA_ARGS__, SCM_UNDEFINED)))))
 
 SCM get_next_unique_context_id ();
 SCM get_next_unique_lyrics_context_id ();
@@ -179,18 +220,15 @@ SCM get_next_unique_lyrics_context_id ();
 
 
 static Music *make_music_with_input (SCM name, Input where);
-SCM check_scheme_arg (Lily_parser *parser, Input loc, SCM fallback,
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
 		      SCM arg, SCM args, SCM pred);
 SCM loc_on_music (Input loc, SCM arg);
-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, Rational alter);
 SCM make_simple_markup (SCM a);
-SCM try_unpack_lyrics (SCM pred, SCM arg);
 bool is_duration (int t);
 bool is_regular_identifier (SCM id);
-bool ly_input_procedure_p (SCM x);
-int yylex (YYSTYPE *s, YYLTYPE *loc, void *v);
+int yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser);
 void set_music_properties (Music *p, SCM a);
 
 %}
@@ -222,15 +260,12 @@ void set_music_properties (Music *p, SCM a);
 %token DRUMS "\\drums"
 %token FIGUREMODE "\\figuremode"
 %token FIGURES "\\figures"
-%token GROBDESCRIPTIONS "\\grobdescriptions"
 %token HEADER "\\header"
 %token INVALID "\\version-error"
-%token KEY "\\key"
 %token LAYOUT "\\layout"
 %token LYRICMODE "\\lyricmode"
 %token LYRICS "\\lyrics"
 %token LYRICSTO "\\lyricsto"
-%token MARK "\\mark"
 %token MARKUP "\\markup"
 %token MARKUPLIST "\\markuplist"
 %token MIDI "\\midi"
@@ -247,13 +282,11 @@ void set_music_properties (Music *p, SCM a);
 %token SET "\\set"
 %token SIMULTANEOUS "\\simultaneous"
 %token TEMPO "\\tempo"
-%token TIMES "\\times"
 %token TYPE "\\type"
 %token UNSET "\\unset"
 %token WITH "\\with"
 
 /* Keyword token exceptions.  */
-%token TIME_T "\\time"
 %token NEWCONTEXT "\\new"
 
 
@@ -302,7 +335,8 @@ If we give names, Bison complains.
 %token <i> EXPECT_PITCH "ly:pitch?"
 %token <i> EXPECT_DURATION "ly:duration?"
 %token <scm> EXPECT_SCM "scheme?"
-%token <scm> SKIPPED_SCM "(scheme?)"
+%token <scm> BACKUP "(backed-up?)"
+%token <scm> REPARSE "(reparsed?)"
 %token <i> EXPECT_MARKUP_LIST "markup-list?"
 %token <scm> EXPECT_OPTIONAL "optional?"
 /* After the last argument. */
@@ -324,6 +358,7 @@ If we give names, Bison complains.
 %token <scm> EVENT_FUNCTION
 %token <scm> FRACTION
 %token <scm> LYRICS_STRING
+%token <scm> LYRIC_ELEMENT
 %token <scm> LYRIC_MARKUP_IDENTIFIER
 %token <scm> MARKUP_FUNCTION
 %token <scm> MARKUP_LIST_FUNCTION
@@ -368,6 +403,7 @@ If we give names, Bison complains.
 %type <scm> closed_music
 %type <scm> music
 %type <scm> music_bare
+%type <scm> music_arg
 %type <scm> complex_music
 %type <scm> complex_music_prefix
 %type <scm> mode_changed_music
@@ -408,6 +444,7 @@ If we give names, Bison complains.
 %type <scm> music_list
 %type <scm> assignment_id
 %type <scm> bare_number
+%type <scm> bare_number_closed
 %type <scm> unsigned_number
 %type <scm> bass_figure
 %type <scm> figured_bass_modification
@@ -431,8 +468,6 @@ If we give names, Bison complains.
 %type <scm> embedded_scm_bare
 %type <scm> embedded_scm_bare_arg
 %type <scm> embedded_scm_closed
-%type <scm> embedded_scm_chord_body
-%type <scm> embedded_scm_event
 %type <scm> event_function_event
 %type <scm> figure_list
 %type <scm> figure_spec
@@ -441,16 +476,25 @@ If we give names, Bison complains.
 %type <scm> full_markup_list
 %type <scm> function_arglist
 %type <scm> function_arglist_optional
-%type <scm> function_arglist_keep
+%type <scm> function_arglist_backup
+%type <scm> function_arglist_nonbackup
+%type <scm> function_arglist_skip
 %type <scm> function_arglist_bare
 %type <scm> function_arglist_closed
 %type <scm> function_arglist_closed_optional
+%type <scm> function_arglist_common
+%type <scm> function_arglist_common_lyric
+%type <scm> function_arglist_common_minus
+%type <scm> function_arglist_closed_common
+%type <scm> function_arglist_keep
 %type <scm> function_arglist_closed_keep
 %type <scm> identifier_init
 %type <scm> lilypond
 %type <scm> lilypond_header
 %type <scm> lilypond_header_body
 %type <scm> lyric_element
+%type <scm> lyric_element_arg
+%type <scm> lyric_element_music
 %type <scm> lyric_markup
 %type <scm> markup
 %type <scm> markup_braced_list
@@ -467,9 +511,7 @@ If we give names, Bison complains.
 %type <scm> mode_changing_head_with_context
 %type <scm> multiplied_duration
 %type <scm> music_function_event
-%type <scm> music_function_event_arglist
 %type <scm> music_function_chord_body
-%type <scm> music_function_chord_body_arglist
 %type <scm> new_chord
 %type <scm> new_lyrics
 %type <scm> number_expression
@@ -485,7 +527,6 @@ If we give names, Bison complains.
 %type <scm> property_operation
 %type <scm> property_path property_path_revved
 %type <scm> scalar
-%type <scm> scalar_bare
 %type <scm> scalar_closed
 %type <scm> scm_function_call
 %type <scm> scm_function_call_closed
@@ -517,11 +558,11 @@ prec levels in different prods */
 start_symbol:
 	lilypond
 	| EMBEDDED_LILY {
-		SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
-		PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+		parser->lexer_->push_note_state (alist_to_hashq (nn));
 	} embedded_lilypond {
-		PARSER->lexer_->pop_state ();
-		PARSER->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
+		parser->lexer_->pop_state ();
+		parser->lexer_->set_identifier (ly_symbol2scm ("parseStringResult"), $3);
  	}
 	;
 
@@ -531,49 +572,49 @@ lilypond:	/* empty */ { }
 	| lilypond assignment {
 	}
 	| lilypond error {
-		PARSER->error_level_ = 1;
+		parser->error_level_ = 1;
 	}
 	| lilypond INVALID	{
-		PARSER->error_level_ = 1;
+		parser->error_level_ = 1;
 	}
 	;
 
 
 toplevel_expression:
 	lilypond_header {
-		PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
+		parser->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
 	}
 	| book_block {
 		Book *book = $1;
-		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-book-handler");
-		scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
+		SCM proc = parser->lexer_->lookup_identifier ("toplevel-book-handler");
+		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 ());
+		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 ());
+		SCM proc = parser->lexer_->lookup_identifier ("toplevel-score-handler");
+		scm_call_2 (proc, parser->self_scm (), score->self_scm ());
 		score->unprotect ();
 	}
 	| composite_music {
 		Music *music = unsmob_music ($1);
-		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-music-handler");
-		scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
+		SCM proc = parser->lexer_->lookup_identifier ("toplevel-music-handler");
+		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));
+		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);
+		SCM proc = parser->lexer_->lookup_identifier ("toplevel-text-handler");
+		scm_call_2 (proc, parser->self_scm (), $1);
 	}
 	| output_def {
 		SCM id = SCM_EOL;
@@ -586,13 +627,16 @@ toplevel_expression:
 		else if ($1->c_variable ("is-layout") == SCM_BOOL_T)
 			id = ly_symbol2scm ("$defaultlayout");
 
-		PARSER->lexer_->set_identifier (id, od->self_scm ());
+		parser->lexer_->set_identifier (id, od->self_scm ());
 		od->unprotect();
 	}
 	;
 
 embedded_scm_bare:
 	SCM_TOKEN
+	{
+		$$ = parser->lexer_->eval_scm ($1);
+	}
 	| SCM_IDENTIFIER
 	;
 
@@ -636,7 +680,7 @@ embedded_scm:
 embedded_scm_arg:
 	embedded_scm_bare_arg
 	| scm_function_call
-	| music
+	| music_arg
 	;
 
 scm_function_call:
@@ -657,18 +701,18 @@ embedded_lilypond:
 				  scm_cons2 ($1, $2, scm_reverse_x ($3, SCM_EOL)));
 	}
 	| error {
-		PARSER->error_level_ = 1;
+		parser->error_level_ = 1;
 	}
 	| INVALID embedded_lilypond {
-		PARSER->error_level_ = 1;
+		parser->error_level_ = 1;
 	}
 	;
 
 
 lilypond_header_body:
 	{
-		$$ = get_header (PARSER);
-		PARSER->lexer_->add_scope ($$);
+		$$ = get_header (parser);
+		parser->lexer_->add_scope ($$);
 	}
 	| lilypond_header_body assignment  {
 
@@ -677,7 +721,7 @@ lilypond_header_body:
 
 lilypond_header:
 	HEADER '{' lilypond_header_body '}'	{
-		$$ = PARSER->lexer_->remove_scope ();
+		$$ = parser->lexer_->remove_scope ();
 	}
 	;
 
@@ -691,11 +735,11 @@ assignment_id:
 
 assignment:
 	assignment_id '=' identifier_init  {
-	        PARSER->lexer_->set_identifier ($1, $3);
+	        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);
+		parser->lexer_->set_identifier (path, $4);
 	;
 /*
  TODO: devise standard for protection in parser.
@@ -730,16 +774,7 @@ identifier_init:
 		$$ = $1;
 	}
 	| music  {
-		/* Hack: Create event-chord around standalone events.
-		   Prevents the identifier from being interpreted as a post-event. */
-		Music *mus = unsmob_music ($1);
-		bool is_event = mus &&
-			(scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
-				!= SCM_BOOL_F);
-		if (!is_event)
-			$$ = $1;
-		else
-			$$ = MAKE_SYNTAX ("event-chord", @$, scm_list_1 ($1));
+		$$ = $1;
 	}
 	| post_event_nofinger {
 		$$ = $1;
@@ -780,15 +815,16 @@ context_def_spec_body:
 		$$ = $1;
 		unsmob_context_def ($$)->origin ()->set_spot (@$);
 	}
-	| context_def_spec_body GROBDESCRIPTIONS embedded_scm {
-		Context_def*td = unsmob_context_def ($$);
+	| context_def_spec_body embedded_scm {
+		if (Context_mod *cm = unsmob_context_mod ($2)) {
+			SCM p = cm->get_mods ();
+			Context_def*td = unsmob_context_def ($$);
 
-		for (SCM p = $3; scm_is_pair (p); p = scm_cdr (p)) {
-			SCM tag = scm_caar (p);
-
-			/* TODO: should make new tag "grob-definition" ? */
-			td->add_context_mod (scm_list_3 (ly_symbol2scm ("assign"),
-							tag, scm_cons (scm_cdar (p), SCM_EOL)));
+			for (; scm_is_pair (p); p = scm_cdr (p)) {
+				td->add_context_mod (scm_car (p));
+			}
+		} else {
+			parser->parser_error (@2, _ ("not a context mod"));
 		}
 	}
 	| context_def_spec_body context_mod {
@@ -808,8 +844,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);
+		pop_paper (parser);
+		parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), SCM_BOOL_F);
 	}
 	;
 
@@ -819,50 +855,50 @@ book_block:
 book_body:
 	{
 		$$ = new Book;
-		init_papers (PARSER);
+		init_papers (parser);
 		$$->origin ()->set_spot (@$);
-		$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (PARSER->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+		$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
 		$$->paper_->unprotect ();
-		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);
+		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);
+		parser->lexer_->set_identifier (ly_symbol2scm ("$current-book"), $1);
 	}
 	| book_body paper_block {
 		$$->paper_ = $2;
 		$2->unprotect ();
-		set_paper (PARSER, $2);
+		set_paper (parser, $2);
 	}
 	| book_body bookpart_block {
 		Book *bookpart = $2;
-		SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler");
+		SCM proc = parser->lexer_->lookup_identifier ("book-bookpart-handler");
 		scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ());
 		bookpart->unprotect ();
 	}
 	| book_body score_block {
 		Score *score = $2;
-		SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
+		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 ());
+		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 {
-		SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+		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 proc = parser->lexer_->lookup_identifier ("book-text-handler");
 		scm_call_2 (proc, $$->self_scm (), $2);
 	}
 	| book_body lilypond_header {
@@ -879,7 +915,7 @@ book_body:
 bookpart_block:
 	BOOKPART '{' bookpart_body '}' {
 		$$ = $3;
-		PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
+		parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), SCM_BOOL_F);
 	}
 	;
 
@@ -887,13 +923,13 @@ bookpart_body:
 	{
 		$$ = new Book;
 		$$->origin ()->set_spot (@$);
-		PARSER->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $$->self_scm ());
+		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);
+		parser->lexer_->set_identifier (ly_symbol2scm ("$current-bookpart"), $1);
 	}
 	| bookpart_body paper_block {
 		$$->paper_ = $2;
@@ -901,21 +937,21 @@ bookpart_body:
 	}
 	| bookpart_body score_block {
 		Score *score = $2;
-		SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler");
+		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 ());
+		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 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 proc = parser->lexer_->lookup_identifier ("bookpart-text-handler");
 		scm_call_2 (proc, $$->self_scm (), $2);
 	}
 	| bookpart_body lilypond_header {
@@ -938,7 +974,7 @@ score_body:
 	music {
 		SCM m = $1;
 		SCM scorify = ly_lily_module_constant ("scorify-music");
-		SCM score = scm_call_2 (scorify, m, PARSER->self_scm ());
+		SCM score = scm_call_2 (scorify, m, parser->self_scm ());
 
 		// pass ownernship to C++ again.
 		$$ = unsmob_score (score);
@@ -956,7 +992,7 @@ score_body:
 	| 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"));
+			parser->parser_error (@2, _("\\paper cannot be used in \\score, use \\layout instead"));
 
 		}
 		else
@@ -980,9 +1016,9 @@ paper_block:
 		$$ = $1;
 		if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)
 		{
-			PARSER->parser_error (@1, _ ("need \\paper for paper block"));
+			parser->parser_error (@1, _ ("need \\paper for paper block"));
 			$1->unprotect ();
-			$$ = get_paper (PARSER);
+			$$ = get_paper (parser);
 		}
 	}
 	;
@@ -992,33 +1028,33 @@ output_def:
 	output_def_body '}' {
 		$$ = $1;
 
-		PARSER->lexer_->remove_scope ();
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->remove_scope ();
+		parser->lexer_->pop_state ();
 	}
 	;
 
 output_def_head:
 	PAPER {
-		$$ = get_paper (PARSER);
+		$$ = get_paper (parser);
 		$$->input_origin_ = @$;
-		PARSER->lexer_->add_scope ($$->scope_);
+		parser->lexer_->add_scope ($$->scope_);
 	}
 	| MIDI    {
-		Output_def *p = get_midi (PARSER);
+		Output_def *p = get_midi (parser);
 		$$ = p;
-		PARSER->lexer_->add_scope (p->scope_);
+		parser->lexer_->add_scope (p->scope_);
 	}
 	| LAYOUT 	{
-		Output_def *p = get_layout (PARSER);
+		Output_def *p = get_layout (parser);
 
-		PARSER->lexer_->add_scope (p->scope_);
+		parser->lexer_->add_scope (p->scope_);
 		$$ = p;
 	}
 	;
 
 output_def_head_with_mode_switch:
 	output_def_head {
-		PARSER->lexer_->push_initial_state ();
+		parser->lexer_->push_initial_state ();
 		$$ = $1;
 	}
 	;
@@ -1035,8 +1071,8 @@ output_def_body:
 		o->input_origin_.set_spot (@$);
 		$$ = o;
 		$$->protect ();
-		PARSER->lexer_->remove_scope ();
-		PARSER->lexer_->add_scope (o->scope_);
+		parser->lexer_->remove_scope ();
+		parser->lexer_->add_scope (o->scope_);
 	}
 	| output_def_body assignment  {
 
@@ -1090,11 +1126,15 @@ braced_music_list:
 	}
 	;
 
-music:
-	simple_music
+music:	simple_music
+	| lyric_element_music
 	| composite_music %prec COMPOSITE
 	;
 
+music_arg:
+	simple_music
+	| composite_music %prec COMPOSITE
+	;
 
 repeated_music:
 	REPEAT simple_string unsigned_number music
@@ -1132,9 +1172,9 @@ simple_music:
 	;
 
 context_modification:
-        WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}'
+        WITH { parser->lexer_->push_initial_state (); } '{' context_mod_list '}'
         {
-                PARSER->lexer_->pop_state ();
+                parser->lexer_->pop_state ();
                 $$ = $4;
         }
         | WITH CONTEXT_MOD_IDENTIFIER
@@ -1145,6 +1185,15 @@ context_modification:
         {
                 $$ = $1;
         }
+	| WITH embedded_scm_closed
+	{
+		if (unsmob_context_mod ($2))
+			$$ = $2;
+		else {
+			parser->parser_error (@2, _ ("not a context mod"));
+			$$ = Context_mod ().smobbed_copy ();
+		}
+	}
         ;
 
 optional_context_mod:
@@ -1169,6 +1218,13 @@ context_mod_list:
                  if (md)
                      unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
         }
+	| context_mod_list embedded_scm {
+		Context_mod *md = unsmob_context_mod ($2);
+		if (md)
+			unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
+		else
+			parser->parser_error (@2, _ ("not a context mod"));
+        }
         ;
 
 composite_music:
@@ -1200,116 +1256,428 @@ grouped_music_list:
  MUSIC_FUNCTION EXPECT_PITCH EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
 and this rule returns the reversed list of arguments. */
 
+function_arglist_skip:
+	function_arglist_common
+	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip
+	{
+		$$ = scm_cons ($1, $3);
+	} %prec FUNCTION_ARGLIST
+	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip
+	{
+		$$ = scm_cons ($1, $3);
+	} %prec FUNCTION_ARGLIST
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip
+	{
+		$$ = scm_cons ($1, $3);
+	} %prec FUNCTION_ARGLIST
+	;
 
-function_arglist:
-	function_arglist_bare
-	| EXPECT_SCM function_arglist_optional embedded_scm_arg
+
+function_arglist_nonbackup:
+	EXPECT_OPTIONAL EXPECT_PITCH function_arglist pitch_also_in_chords {
+		$$ = scm_cons ($4, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed duration_length {
+		$$ = scm_cons ($4, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist embedded_scm_arg_closed
 	{
-		$$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
-				       $3, $2, $1);
+		$$ = check_scheme_arg (parser, @4, $4, $3, $2);
 	}
-	| EXPECT_SCM function_arglist_optional SKIPPED_SCM
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed bare_number_closed
 	{
-		$$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
-				       $3, $2, $1);
+		$$ = check_scheme_arg (parser, @4, $4, $3, $2);
 	}
-	;
-
-function_arglist_optional:
-	function_arglist_keep %prec FUNCTION_ARGUMENTS
-	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed FRACTION
 	{
-		$$ = scm_cons ($1, $3);
+		$$ = check_scheme_arg (parser, @4, $4, $3, $2);
 	}
-	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed post_event_nofinger
 	{
-		$$ = scm_cons ($1, $3);
+		$$ = check_scheme_arg (parser, @4, $4, $3, $2);
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' UNSIGNED
+	{
+		SCM n = scm_difference ($5, SCM_UNDEFINED);
+		if (scm_is_true (scm_call_1 ($2, n)))
+			$$ = scm_cons (n, $3);
+		else {
+			Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5);
+			t->set_property ("digit", $5);
+			$$ = t->unprotect ();
+			if (scm_is_true (scm_call_1 ($2, $$)))
+				$$ = scm_cons ($$, $3);
+			else
+				$$ = check_scheme_arg (parser, @4, n, $3, $2);
+		}
+		
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_optional
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' REAL
 	{
-		$$ = scm_cons (loc_on_music (@3, $1), $3);
+		$$ = check_scheme_arg (parser, @4,
+				       scm_difference ($5, SCM_UNDEFINED),
+				       $3, $2);
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed '-' NUMBER_IDENTIFIER
+	{
+		$$ = check_scheme_arg (parser, @4,
+				       scm_difference ($5, SCM_UNDEFINED),
+				       $3, $2);
 	}
 	;
 
+
 function_arglist_keep:
-	EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords {
-		$$ = scm_cons ($4, $3);
+	function_arglist_common
+	| function_arglist_backup
+	;
+
+function_arglist_closed_keep:
+	function_arglist_closed_common
+	| function_arglist_backup
+	;
+
+function_arglist_backup:
+	EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+	{
+		if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			$$ = scm_cons ($4, $3);
+		} else {
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (SCM_IDENTIFIER, $4, @4);
+		}
 	}
-	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length {
-		$$ = scm_cons ($4, $3);
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep post_event_nofinger
+	{
+		if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			$$ = scm_cons ($4, $3);
+		} else {
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (EVENT_IDENTIFIER, $4, @4);
+		}
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep lyric_element
+	{
+		// There is no point interpreting a lyrics string as
+		// an event, since we don't allow music possibly
+		// followed by durations or postevent into closed
+		// music, and we only accept closed music in optional
+		// arguments at the moment.  If this changes, more
+		// complex schemes might become interesting here as
+		// well: see how we do this at the mandatory argument
+		// point.
+		if (scm_is_true (scm_call_1 ($2, $4)))
+			$$ = scm_cons ($4, $3);
+		else {
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (LYRICS_STRING, $4, @4);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep UNSIGNED
+	{
+		if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			$$ = $3;
+			MYREPARSE (@4, $2, UNSIGNED, $4);
+		} else {
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (UNSIGNED, $4, @4);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep REAL
+	{
+		if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			$$ = $3;
+			MYREPARSE (@4, $2, REAL, $4);
+		} else {
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (REAL, $4, @4);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep NUMBER_IDENTIFIER
 	{
 		if (scm_is_true (scm_call_1 ($2, $4)))
 		{
 			$$ = scm_cons ($4, $3);
 		} else {
-			$$ = try_unpack_lyrics ($2, $4);
-			if (!SCM_UNBNDP ($$))
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (NUMBER_IDENTIFIER, $4, @4);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep FRACTION
+	{
+		if (scm_is_true (scm_call_1 ($2, $4)))
+		{
+			$$ = scm_cons ($4, $3);
+		} else {
+			$$ = scm_cons (loc_on_music (@3, $1), $3);
+			MYBACKUP (FRACTION, $4, @4);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' UNSIGNED
+	{
+		SCM n = scm_difference ($5, SCM_UNDEFINED);
+		if (scm_is_true (scm_call_1 ($2, n))) {
+			$$ = $3;
+			MYREPARSE (@5, $2, REAL, n);
+		} else {
+			Music *t = MY_MAKE_MUSIC ("FingeringEvent", @5);
+			t->set_property ("digit", $5);
+			$$ = t->unprotect ();
+			if (scm_is_true (scm_call_1 ($2, $$)))
 				$$ = scm_cons ($$, $3);
 			else {
 				$$ = scm_cons (loc_on_music (@3, $1), $3);
-				MYBACKUP (SKIPPED_SCM, $4, @4);
+				MYBACKUP (UNSIGNED, $5, @5);
+				parser->lexer_->push_extra_token ('-');
 			}
 		}
+		
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' REAL
+	{
+		SCM n = scm_difference ($5, SCM_UNDEFINED);
+		if (scm_is_true (scm_call_1 ($2, n))) {
+			MYREPARSE (@5, $2, REAL, n);
+			$$ = $3;
+		} else {
+			MYBACKUP (REAL, n, @5);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_keep '-' NUMBER_IDENTIFIER
+	{
+		SCM n = scm_difference ($5, SCM_UNDEFINED);
+		if (scm_is_true (scm_call_1 ($2, n))) {
+			$$ = scm_cons (n, $3);
+		} else {
+			MYBACKUP (NUMBER_IDENTIFIER, n, @5);
+		}
+	}
+	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords
+	{
+		$$ = scm_cons ($4, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length
+	{
+		$$ = scm_cons ($4, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup BACKUP
+	{
+		$$ = scm_cons ($1, $3);
+		MYBACKUP(0, SCM_UNDEFINED, @3);
+	}
+	| function_arglist_backup REPARSE embedded_scm_arg_closed
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $1, $2);
+	}
+	| function_arglist_backup REPARSE bare_number
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $1, $2);
+	}
+	| function_arglist_backup REPARSE fraction
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $1, $2);
 	}
-	| function_arglist
 	;
 
+function_arglist:
+	function_arglist_common
+	| function_arglist_nonbackup
+	;
 
-function_arglist_closed:
+function_arglist_common:
 	function_arglist_bare
-	| EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
+	| EXPECT_SCM function_arglist_optional embedded_scm_arg
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
+	}
+	| EXPECT_SCM function_arglist_closed_optional bare_number
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
+	}
+	| EXPECT_SCM function_arglist_closed_optional fraction
 	{
-		$$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+		$$ = check_scheme_arg (parser, @3,
 				       $3, $2, $1);
 	}
-	| EXPECT_SCM function_arglist_optional SKIPPED_SCM
+	| EXPECT_SCM function_arglist_closed_optional post_event_nofinger
 	{
-		$$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
+		$$ = check_scheme_arg (parser, @3,
 				       $3, $2, $1);
 	}
+	| function_arglist_common_minus
+	| function_arglist_common_lyric
 	;
 
-function_arglist_closed_optional:
-	function_arglist_closed_keep %prec FUNCTION_ARGUMENTS
-	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional
+function_arglist_common_lyric:
+	EXPECT_SCM function_arglist_optional lyric_element
 	{
-		$$ = scm_cons ($1, $3);
+		// We check how the predicate thinks about a lyrics
+		// event or about a markup.  If it accepts neither, we
+		// backup the original token.  Otherwise we commit to
+		// taking the token.  Depending on what the predicate
+		// is willing to accept, we interpret as a string, as
+		// a lyric event, or ambiguously (meaning that if
+		// something looking like a duration or post event
+		// follows, we take the event, otherwise the string).
+		SCM lyric_event = MAKE_SYNTAX ("lyric-event", @3, $3,
+					       parser->default_duration_.smobbed_copy ());
+		if (scm_is_true (scm_call_1 ($1, $3)))
+			if (scm_is_true (scm_call_1 ($1, lyric_event)))
+			{
+				$$ = $2;
+				MYREPARSE (@3, $1, LYRICS_STRING, $3);
+			} else {
+				$$ = scm_cons ($3, $2);
+			}
+		else if (scm_is_true (scm_call_1 ($1, lyric_event)))
+		{
+			$$ = $2;
+			MYREPARSE (@3, $1, LYRIC_ELEMENT, $3);
+		} else {
+			// This is going to flag a syntax error, we
+			// know the predicate to be false.
+			check_scheme_arg (parser, @3,
+					  $3, $2, $1);
+		}
 	}
-	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional
+	| function_arglist_common_lyric REPARSE lyric_element_arg
 	{
-		$$ = scm_cons ($1, $3);
+		// This should never be false
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $1, $2);
+	}
+	;
+
+function_arglist_common_minus:
+	EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
+	{
+		SCM n = scm_difference ($4, SCM_UNDEFINED);
+		if (scm_is_true (scm_call_1 ($1, n))) {
+			$$ = $2;
+			MYREPARSE (@4, $1, REAL, n);
+		} else {
+			Music *t = MY_MAKE_MUSIC ("FingeringEvent", @4);
+			t->set_property ("digit", $4);
+			$$ = t->unprotect ();
+			if (scm_is_true (scm_call_1 ($1, $$)))
+				$$ = scm_cons ($$, $2);
+			else
+				$$ = check_scheme_arg (parser, @3, n, $2, $1);
+		}
+		
+	}
+	| EXPECT_SCM function_arglist_closed_optional '-' REAL
+	{
+		$$ = $2;
+		SCM n = scm_difference ($4, SCM_UNDEFINED);
+		MYREPARSE (@4, $1, REAL, n);
+	}
+	| EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
+	{
+		SCM n = scm_difference ($4, SCM_UNDEFINED);
+		$$ = check_scheme_arg (parser, @4, n, $2, $1);
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_closed_optional
+	| function_arglist_common_minus REPARSE bare_number
 	{
-		$$ = scm_cons (loc_on_music (@3, $1), $3);
+		$$ = check_scheme_arg (parser, @3, $3, $1, $2);
 	}
 	;
 
-function_arglist_closed_keep:
-	EXPECT_OPTIONAL EXPECT_PITCH function_arglist_keep pitch_also_in_chords {
-		$$ = scm_cons ($4, $3);
+function_arglist_closed:
+	function_arglist_closed_common
+	| function_arglist_nonbackup
+	;
+
+function_arglist_closed_common:
+	function_arglist_bare
+	| EXPECT_SCM function_arglist_optional embedded_scm_arg_closed
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
 	}
-	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_keep duration_length {
-		$$ = scm_cons ($4, $3);
+	| EXPECT_SCM function_arglist_closed_optional bare_number
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
 	}
-	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_keep embedded_scm_arg_closed
+	| EXPECT_SCM function_arglist_closed_optional '-' UNSIGNED
 	{
-		if (scm_is_true (scm_call_1 ($2, $4)))
-		{
-			$$ = scm_cons ($4, $3);
+		SCM n = scm_difference ($4, SCM_UNDEFINED);
+		if (scm_is_true (scm_call_1 ($1, n))) {
+			$$ = scm_cons (n, $2);
 		} else {
-			$$ = try_unpack_lyrics ($2, $4);
-			if (!SCM_UNBNDP ($$))
-				$$ = scm_cons ($$, $3);
-			else {
-				$$ = scm_cons (loc_on_music (@3, $1), $3);
-				MYBACKUP (SKIPPED_SCM, $4, @4);
-			}
+			Music *t = MY_MAKE_MUSIC ("FingeringEvent", @4);
+			t->set_property ("digit", $4);
+			$$ = t->unprotect ();
+			if (scm_is_true (scm_call_1 ($1, $$)))
+				$$ = scm_cons ($$, $2);
+			else
+				$$ = check_scheme_arg (parser, @3, n, $2, $1);
 		}
+		
+	}
+	| EXPECT_SCM function_arglist_closed_optional '-' REAL
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       scm_difference ($4, SCM_UNDEFINED),
+				       $2, $1);
+	}
+	| EXPECT_SCM function_arglist_closed_optional '-' NUMBER_IDENTIFIER
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       scm_difference ($4, SCM_UNDEFINED),
+				       $2, $1);
+	}
+	| EXPECT_SCM function_arglist_closed_optional post_event_nofinger
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
+	}
+	| EXPECT_SCM function_arglist_closed_optional fraction
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
+	}
+	| EXPECT_SCM function_arglist_optional lyric_element
+	{
+		$$ = check_scheme_arg (parser, @3,
+				       $3, $2, $1);
+	}
+	;
+
+function_arglist_optional:
+	function_arglist_keep %prec FUNCTION_ARGLIST
+	| function_arglist_backup BACKUP
+	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_optional
+	{
+		$$ = scm_cons ($1, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_optional
+	{
+		$$ = scm_cons ($1, $3);
+	}
+	;
+
+function_arglist_closed_optional:
+	function_arglist_closed_keep %prec FUNCTION_ARGLIST
+	| function_arglist_backup BACKUP
+	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_closed_optional
+	{
+		$$ = scm_cons ($1, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_closed_optional
+	{
+		$$ = scm_cons ($1, $3);
 	}
-	| function_arglist_closed
 	;
 
 embedded_scm_closed:
@@ -1327,7 +1695,7 @@ scm_function_call_closed:
 	SCM_FUNCTION function_arglist_closed {
 		$$ = MAKE_SYNTAX ("music-function", @$,
 					 $1, $2);
-	}
+	} %prec FUNCTION_ARGLIST
 	;
 
 function_arglist_bare:
@@ -1340,6 +1708,15 @@ function_arglist_bare:
 	| EXPECT_DURATION function_arglist_closed_optional duration_length {
 		$$ = scm_cons ($3, $2);
 	}
+	| EXPECT_OPTIONAL EXPECT_PITCH function_arglist_skip DEFAULT {
+		$$ = scm_cons ($1, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_DURATION function_arglist_skip DEFAULT {
+		$$ = scm_cons ($1, $3);
+	}
+	| EXPECT_OPTIONAL EXPECT_SCM function_arglist_skip DEFAULT {
+		$$ = scm_cons ($1, $3);
+	}
 	;
 
 music_function_call:
@@ -1382,9 +1759,6 @@ complex_music_prefix:
                         mods = ctxmod->get_mods ();
 		$$ = START_MAKE_SYNTAX ("context-specification", $2, $3, mods, SCM_BOOL_T);
 	}
-	| TIMES fraction {
-                $$ = START_MAKE_SYNTAX ("time-scaled-music", $2);
-	}
 	;
 
 mode_changed_music:
@@ -1397,7 +1771,7 @@ mode_changed_music:
 		{
 		  $$ = $2;
 		}
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 	}
 	| mode_changing_head_with_context optional_context_mod grouped_music_list {
                 Context_mod *ctxmod = unsmob_context_mod ($2);
@@ -1409,82 +1783,82 @@ mode_changed_music:
 		{
 		  $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
 		}
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 	}
 	;
 
 mode_changing_head:
 	NOTEMODE {
-		SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
-		PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+		parser->lexer_->push_note_state (alist_to_hashq (nn));
 
 		$$ = ly_symbol2scm ("notes");
 	}
 	| DRUMMODE
 		{
-		SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
-		PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
+		parser->lexer_->push_note_state (alist_to_hashq (nn));
 
 		$$ = ly_symbol2scm ("drums");
 	}
 	| FIGUREMODE {
-		PARSER->lexer_->push_figuredbass_state ();
+		parser->lexer_->push_figuredbass_state ();
 
 		$$ = ly_symbol2scm ("figures");
 	}
 	| CHORDMODE {
-		SCM nn = PARSER->lexer_->lookup_identifier ("chordmodifiers");
-		PARSER->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
-		nn = PARSER->lexer_->lookup_identifier ("pitchnames");
-		PARSER->lexer_->push_chord_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
+		parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+		nn = parser->lexer_->lookup_identifier ("pitchnames");
+		parser->lexer_->push_chord_state (alist_to_hashq (nn));
 		$$ = ly_symbol2scm ("chords");
 
 	}
 	| LYRICMODE
-		{ PARSER->lexer_->push_lyric_state ();
+		{ parser->lexer_->push_lyric_state ();
 		$$ = ly_symbol2scm ("lyrics");
 	}
 	;
 
 mode_changing_head_with_context:
 	DRUMS {
-		SCM nn = PARSER->lexer_->lookup_identifier ("drumPitchNames");
-		PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("drumPitchNames");
+		parser->lexer_->push_note_state (alist_to_hashq (nn));
 
 		$$ = ly_symbol2scm ("DrumStaff");
 	}
 	| FIGURES {
-		PARSER->lexer_->push_figuredbass_state ();
+		parser->lexer_->push_figuredbass_state ();
 
 		$$ = ly_symbol2scm ("FiguredBass");
 	}
 	| CHORDS {
-		SCM nn = PARSER->lexer_->lookup_identifier ("chordmodifiers");
-		PARSER->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
-		nn = PARSER->lexer_->lookup_identifier ("pitchnames");
-		PARSER->lexer_->push_chord_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("chordmodifiers");
+		parser->lexer_->chordmodifier_tab_ = alist_to_hashq (nn);
+		nn = parser->lexer_->lookup_identifier ("pitchnames");
+		parser->lexer_->push_chord_state (alist_to_hashq (nn));
 		$$ = ly_symbol2scm ("ChordNames");
 	}
 	| LYRICS
-		{ PARSER->lexer_->push_lyric_state ();
+		{ parser->lexer_->push_lyric_state ();
 		$$ = ly_symbol2scm ("Lyrics");
 	}
 	;
 
 new_lyrics:
-	ADDLYRICS { PARSER->lexer_->push_lyric_state (); }
+	ADDLYRICS { parser->lexer_->push_lyric_state (); }
 	/*cont */
 	composite_music {
 	/* Can also use music at the expensive of two S/Rs similar to
            \repeat \alternative */
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 
 		$$ = scm_cons ($3, SCM_EOL);
 	}
 	| new_lyrics ADDLYRICS {
-		PARSER->lexer_->push_lyric_state ();
+		parser->lexer_->push_lyric_state ();
 	} composite_music {
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 		$$ = scm_cons ($4, $1);
 	}
 	;
@@ -1494,9 +1868,9 @@ re_rhythmed_music:
 		$$ = MAKE_SYNTAX ("add-lyrics", @$, $1, scm_reverse_x ($2, SCM_EOL));
 	} %prec COMPOSITE
 	| LYRICSTO simple_string {
-		PARSER->lexer_->push_lyric_state ();
+		parser->lexer_->push_lyric_state ();
 	} music {
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 		$$ = MAKE_SYNTAX ("lyric-combine", @$, $2, $4);
 	}
 	;
@@ -1566,7 +1940,7 @@ context_mod:
 	   if (ly_symbol2scm ("consists") != $1)
 	   {
 	     $$ = SCM_EOL;
-             PARSER->parser_error (@1, _ ("only \\consists takes non-string argument."));
+             parser->parser_error (@1, _ ("only \\consists takes non-string argument."));
 	   }
 	   else
 	   {
@@ -1620,7 +1994,7 @@ simple_music_property_def:
 
 music_property_def:
 	simple_music_property_def {
-		$$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (PARSER->self_scm (), make_input (@$), $1));
+		$$ = LOWLEVEL_MAKE_SYNTAX (ly_lily_module_constant ("property-operation"), scm_cons2 (parser->self_scm (), make_input (@$), $1));
 	}
 	;
 
@@ -1647,44 +2021,27 @@ simple_string: STRING {
 	}
 	;
 
-scalar_bare:
-	string {
-		$$ = $1;
-	}
-	| lyric_element {
-		$$ = $1;
-	}
-	| bare_number {
-		$$ = $1;
-	}
-        | embedded_scm_bare {
-		$$ = $1;
-	}
-	| full_markup {
-		$$ = $1;
-	}
-	| full_markup_list
-	{
-		$$ = $1;
-	}
-	;
-
 scalar:
-	scalar_bare |
-	scm_function_call
+	embedded_scm_arg
+	| bare_number
+	| lyric_element
 	;
 
 scalar_closed:
-	scalar_bare |
-	scm_function_call_closed
+	embedded_scm_arg_closed
+	| bare_number
+	| lyric_element
 	;
 
 
 event_chord:
-	/* TODO: Create a special case that avoids the creation of
-	   EventChords around simple_elements that have no post_events?
-	 */
-	simple_chord_elements post_events	{
+	simple_element post_events {
+		// Let the rhythmic music iterator sort this mess out.
+		if (scm_is_pair ($2))
+			unsmob_music ($1)->set_property ("articulations",
+							 scm_reverse_x ($2, SCM_EOL));
+	}
+	| simple_chord_elements post_events	{
 		SCM elts = ly_append2 ($1, scm_reverse_x ($2, SCM_EOL));
 
 		Input i;
@@ -1697,8 +2054,8 @@ event_chord:
 		Input i;
 		i.set_location (@1, @3);
 		$$ = MAKE_SYNTAX ("repetition-chord", i,
-				  PARSER->lexer_->chord_repetition_.last_chord_,
-				  PARSER->lexer_->chord_repetition_.repetition_function_,
+				  parser->lexer_->chord_repetition_.last_chord_,
+				  parser->lexer_->chord_repetition_.repetition_function_,
 				  $2, scm_reverse_x ($3, SCM_EOL));
 	}
 	| MULTI_MEASURE_REST optional_notemode_duration post_events {
@@ -1709,11 +2066,11 @@ event_chord:
 	}
 	| command_element
 	/* note chord elements are memorized into
-	   PARSER->lexer_->chord_repetition_ so that the chord repetition
+	   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_ = $$;
+		parser->lexer_->chord_repetition_.last_chord_ = $$;
 	}
 	;
 
@@ -1746,7 +2103,8 @@ chord_body:
 chord_body_elements:
 	/* empty */ 		{ $$ = SCM_EOL; }
 	| chord_body_elements chord_body_element {
-		$$ = scm_cons ($2, $1);
+		if (!SCM_UNBNDP ($2))
+			$$ = scm_cons ($2, $1);
 	}
 	;
 
@@ -1788,76 +2146,40 @@ chord_body_element:
 		$$ = n->unprotect ();
 	}
 	| music_function_chord_body
-	;
-
-/* We can't accept a music argument, not even a closed one,
- * immediately before chord_body_elements, otherwise a function \fun
- * with a signature of two music arguments can't be sorted out
- * properly in a construct like
- * <\fun { c } \fun { c } c>
- * The second call could be interpreted either as a chord constituent
- * or a music expression.
- */
-
-music_function_chord_body_arglist:
-	function_arglist_bare
-	| EXPECT_SCM music_function_chord_body_arglist embedded_scm_chord_body
 	{
-		$$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
-				       $3, $2, $1);
-	}
-	;
+		Music *m = unsmob_music ($1);
 
-embedded_scm_chord_body:
-	embedded_scm_bare_arg
-	| SCM_FUNCTION music_function_chord_body_arglist {
-		$$ = MAKE_SYNTAX ("music-function", @$,
-					 $1, $2);
-	}
-	| chord_body_element
-	| SKIPPED_SCM
-	;
+		while (m && m->is_mus_type ("music-wrapper-music")) {
+			$$ = m->get_property ("element");
+			m = unsmob_music ($$);
+		}
 
-music_function_chord_body:
-	MUSIC_FUNCTION music_function_chord_body_arglist {
-		$$ = MAKE_SYNTAX ("music-function", @$,
-					 $1, $2);
+		if (!(m && m->is_mus_type ("rhythmic-event"))) {
+			parser->parser_error (@$, _ ("not a rhythmic event"));
+			$$ = SCM_UNDEFINED;
+		}
 	}
 	;
 
-/* We could accept a closed music argument before the post events
- * indicated by a trailing argument list.  For symmetry with chord
- * bodies and in order to avoid too tricky and complex behavior, we
- * refrain from doing so.
- */
-music_function_event_arglist:
-	function_arglist_bare
-	| EXPECT_SCM music_function_event_arglist embedded_scm_event
-	{
-		$$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED,
-				       $3, $2, $1);
-	}
+music_function_chord_body:
+	music_function_call
+	| MUSIC_IDENTIFIER
 	;
 
-embedded_scm_event:
-	embedded_scm_bare_arg
-	| SCM_FUNCTION music_function_event_arglist {
-		$$ = MAKE_SYNTAX ("music-function", @$,
-					 $1, $2);
-	}
-	| post_event
-	| SKIPPED_SCM
-	;
+// Event functions may only take closed arglists, otherwise it would
+// not be clear whether a following postevent should be associated
+// with the last argument of the event function or with the expression
+// for which the function call acts itself as event.
 
 music_function_event:
-	MUSIC_FUNCTION music_function_event_arglist {
+	MUSIC_FUNCTION function_arglist_closed {
 		$$ = MAKE_SYNTAX ("music-function", @$,
 					 $1, $2);
 	}
 	;
 
 event_function_event:
-	EVENT_FUNCTION music_function_event_arglist {
+	EVENT_FUNCTION function_arglist_closed {
 		$$ = MAKE_SYNTAX ("music-function", @$,
 					 $1, $2);
 	}
@@ -1881,7 +2203,7 @@ command_element:
 		$$ = MAKE_SYNTAX ("voice-separator", @$);
 	}
 	| '|'      {
-		SCM pipe = PARSER->lexer_->lookup_identifier ("pipeSymbol");
+		SCM pipe = parser->lexer_->lookup_identifier ("pipeSymbol");
 
 		Music *m = unsmob_music (pipe);
 		if (m)
@@ -1894,45 +2216,15 @@ command_element:
 			$$ = MAKE_SYNTAX ("bar-check", @$);
 
 	}
-	| TIME_T fraction  {
-		SCM proc = ly_lily_module_constant ("make-time-signature-set");
-
-		$$ = scm_apply_2   (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
-	}
-	| MARK scalar {
-		$$ = MAKE_SYNTAX ("make-mark-set", @$, $2);
-	}
 	;
 
 command_event:
 	E_TILDE {
 		$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent", @$)->unprotect ();
 	}
-	| MARK DEFAULT  {
-		Music *m = MY_MAKE_MUSIC ("MarkEvent", @$);
-		$$ = m->unprotect ();
-	}
 	| tempo_event {
 		$$ = $1;
 	}
-	| KEY DEFAULT {
-		Music *key = MY_MAKE_MUSIC ("KeyChangeEvent", @$);
-		$$ = key->unprotect ();
-	}
-	| KEY NOTENAME_PITCH SCM_IDENTIFIER 	{
-
-		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));
-		} else {
-			PARSER->parser_error (@3, _ ("second argument must be pitch list"));
-		}
-
-		$$ = key->unprotect ();
-	}
 	;
 
 
@@ -1958,13 +2250,13 @@ post_event_nofinger:
 		}
 	}
 	| HYPHEN {
-		if (!PARSER->lexer_->is_lyric_state ())
-			PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+		if (!parser->lexer_->is_lyric_state ())
+			parser->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
 		$$ = MY_MAKE_MUSIC ("HyphenEvent", @$)->unprotect ();
 	}
 	| EXTENDER {
-		if (!PARSER->lexer_->is_lyric_state ())
-			PARSER->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
+		if (!parser->lexer_->is_lyric_state ())
+			parser->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
 		$$ = MY_MAKE_MUSIC ("ExtenderEvent", @$)->unprotect ();
 	}
 	| script_dir direction_reqd_event {
@@ -1984,16 +2276,21 @@ post_event_nofinger:
 		$$ = $2;
 	}
 	| string_number_event
+	| '^' fingering
+	{
+		$$ = $2;
+		unsmob_music ($$)->set_property ("direction", scm_from_int (UP));
+	}
+	| '_' fingering
+	{
+		$$ = $2;
+		unsmob_music ($$)->set_property ("direction", scm_from_int (DOWN));
+	}			
 	;
 
 post_event:
 	post_event_nofinger
-	| script_dir fingering {
-		if ($1)
-		{
-			Music *m = unsmob_music ($2);
-			m->set_property ("direction", scm_from_int ($1));
-		}
+	| '-' fingering {
 		$$ = $2;
 	}
 	;
@@ -2041,7 +2338,7 @@ direction_less_char:
 
 direction_less_event:
 	direction_less_char {
-		SCM predefd = PARSER->lexer_->lookup_identifier_symbol ($1);
+		SCM predefd = parser->lexer_->lookup_identifier_symbol ($1);
 		Music *m = 0;
 		if (unsmob_music (predefd))
 		{
@@ -2070,11 +2367,11 @@ direction_reqd_event:
 		$$ = $1;
 	}
 	| script_abbreviation {
-		SCM s = PARSER->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
+		SCM s = parser->lexer_->lookup_identifier ("dash" + ly_scm2string ($1));
 		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"));
+		else parser->parser_error (@1, _ ("expecting string as script definition"));
 		$$ = a->unprotect ();
 	}
 	;
@@ -2159,7 +2456,7 @@ gen_text_def:
 		t->set_property ("text", $1);
 		$$ = t->unprotect ();
 	}
-	| string {
+	| simple_string {
 		Music *t = MY_MAKE_MUSIC ("TextScriptEvent", @$);
 		t->set_property ("text",
 			make_simple_markup ($1));
@@ -2213,12 +2510,12 @@ duration_length:
 
 optional_notemode_duration:
 	{
-		Duration dd = PARSER->default_duration_;
+		Duration dd = parser->default_duration_;
 		$$ = dd.smobbed_copy ();
 	}
 	| multiplied_duration	{
 		$$ = $1;
-		PARSER->default_duration_ = *unsmob_duration ($$);
+		parser->default_duration_ = *unsmob_duration ($$);
 	}
 	;
 
@@ -2226,7 +2523,7 @@ steno_duration:
 	bare_unsigned dots		{
 		int len = 0;
 		if (!is_duration ($1))
-			PARSER->parser_error (@1, _f ("not a duration: %d", $1));
+			parser->parser_error (@1, _f ("not a duration: %d", $1));
 		else
 			len = intlog2 ($1);
 
@@ -2277,7 +2574,7 @@ tremolo_type:
 	}
 	| ':' bare_unsigned {
 		if (!is_duration ($2))
-			PARSER->parser_error (@2, _f ("not a duration: %d", $2));
+			parser->parser_error (@2, _f ("not a duration: %d", $2));
 		$$ = $2;
 	}
 	;
@@ -2395,8 +2692,8 @@ optional_rest:
 
 simple_element:
 	pitch exclamations questions octave_check optional_notemode_duration optional_rest {
-		if (!PARSER->lexer_->is_note_state ())
-			PARSER->parser_error (@1, _ ("have to be in Note mode for notes"));
+		if (!parser->lexer_->is_note_state ())
+			parser->parser_error (@1, _ ("have to be in Note mode for notes"));
 
 		Music *n = 0;
 		if ($6)
@@ -2440,24 +2737,12 @@ simple_element:
 		ev->set_property ("duration", $2);
  		$$ = 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", @$);
-		levent->set_property ("text", $1);
-		levent->set_property ("duration",$2);
-		$$= levent->unprotect ();
-	}
 	;
 
 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"));
+	new_chord {
+                if (!parser->lexer_->is_chord_state ())
+                        parser->parser_error (@1, _ ("have to be in Chord mode for chords"));
                 $$ = $1;
 	}
 	| figure_spec optional_notemode_duration {
@@ -2478,6 +2763,38 @@ lyric_element:
 	}
 	;
 
+lyric_element_arg:
+	lyric_element
+	| lyric_element multiplied_duration post_events {
+		$$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+		if (scm_is_pair ($3))
+			unsmob_music ($$)->set_property
+				("articulations", scm_reverse_x ($3, SCM_EOL));
+	}
+	| lyric_element post_event post_events {
+		$$ = MAKE_SYNTAX ("lyric-event", @$, $1,
+				  parser->default_duration_.smobbed_copy ());
+		unsmob_music ($$)->set_property
+			("articulations", scm_cons ($2, scm_reverse_x ($3, SCM_EOL)));
+	}
+	| LYRIC_ELEMENT optional_notemode_duration post_events {
+		$$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+		if (scm_is_pair ($3))
+			unsmob_music ($$)->set_property
+				("articulations", scm_reverse_x ($3, SCM_EOL));
+	}
+	;
+
+
+lyric_element_music:
+	lyric_element optional_notemode_duration post_events {
+		$$ = MAKE_SYNTAX ("lyric-event", @$, $1, $2);
+		if (scm_is_pair ($3))
+			unsmob_music ($$)->set_property
+				("articulations", scm_reverse_x ($3, SCM_EOL));
+	}
+	;
+
 new_chord:
 	steno_tonic_pitch optional_notemode_duration   {
 		$$ = make_chord_elements ($1, $2, SCM_EOL);
@@ -2589,23 +2906,20 @@ number_factor:
 
 
 bare_number:
-	UNSIGNED	{
-		$$ = $1;
-	}
-	| REAL		{
-		$$ = $1;
-	}
-	| NUMBER_IDENTIFIER		{
-		$$ = $1;
+	bare_number_closed
+	| UNSIGNED NUMBER_IDENTIFIER	{
+		$$ = scm_product ($1, $2);
 	}
 	| REAL NUMBER_IDENTIFIER	{
-		$$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2));
-	}
-	| bare_unsigned NUMBER_IDENTIFIER	{
-		$$ = scm_from_double ($1 *scm_to_double ($2));
+		$$ = scm_product ($1, $2);
 	}
 	;
 
+bare_number_closed:
+	UNSIGNED
+	| REAL
+	| NUMBER_IDENTIFIER
+	;
 
 bare_unsigned:
 	UNSIGNED {
@@ -2637,10 +2951,10 @@ lyric_markup:
 		$$ = $1;
 	}
 	| LYRIC_MARKUP
-		{ PARSER->lexer_->push_markup_state (); }
+		{ parser->lexer_->push_markup_state (); }
 	markup_top {
 		$$ = $3;
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 	}
 	;
 
@@ -2649,10 +2963,10 @@ full_markup_list:
 		$$ = $1;
 	}
 	| MARKUPLIST
-		{ PARSER->lexer_->push_markup_state (); }
+		{ parser->lexer_->push_markup_state (); }
 	markup_list {
 		$$ = $3;
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 	}
 	;
 
@@ -2661,10 +2975,10 @@ full_markup:
 		$$ = $1;
 	}
 	| MARKUP
-		{ PARSER->lexer_->push_markup_state (); }
+		{ parser->lexer_->push_markup_state (); }
 	markup_top {
 		$$ = $3;
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 	}
 	;
 
@@ -2680,6 +2994,21 @@ markup_top:
 	}
 	;
 
+markup_scm:
+	embedded_scm_bare
+	{
+		if (Text_interface::is_markup ($1))
+			MYBACKUP (MARKUP_IDENTIFIER, $1, @1);
+		else if (Text_interface::is_markup_list ($1))
+			MYBACKUP (MARKUPLIST_IDENTIFIER, $1, @1);
+		else {
+			parser->parser_error (@1, _ ("not a markup"));
+			MYBACKUP (MARKUP_IDENTIFIER, scm_string (SCM_EOL), @1);
+		}
+	} BACKUP
+	;
+			
+
 markup_list:
 	MARKUPLIST_IDENTIFIER {
 		$$ = $1;
@@ -2693,6 +3022,10 @@ markup_list:
 	| markup_command_list {
 		$$ = scm_list_1 ($1);
 	}
+	| markup_scm MARKUPLIST_IDENTIFIER
+	{
+		$$ = $2;
+	}
 	;
 
 markup_composed_list:
@@ -2729,7 +3062,7 @@ markup_command_basic_arguments:
 	  $$ = scm_cons ($3, $2);
 	}
 	| EXPECT_SCM markup_command_list_arguments embedded_scm_closed {
-	  $$ = check_scheme_arg (PARSER, @3, SCM_UNDEFINED, $3, $2, $1);
+	  $$ = check_scheme_arg (parser, @3, $3, $2, $1);
 	}
 	| EXPECT_NO_MORE_ARGS {
 	  $$ = SCM_EOL;
@@ -2772,17 +3105,21 @@ simple_markup:
 		$$ = $1;
 	}
 	| SCORE {
-		SCM nn = PARSER->lexer_->lookup_identifier ("pitchnames");
-		PARSER->lexer_->push_note_state (alist_to_hashq (nn));
+		SCM nn = parser->lexer_->lookup_identifier ("pitchnames");
+		parser->lexer_->push_note_state (alist_to_hashq (nn));
 	} '{' score_body '}' {
 		Score * sc = $4;
 		$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
 		sc->unprotect ();
-		PARSER->lexer_->pop_state ();
+		parser->lexer_->pop_state ();
 	}
 	| MARKUP_FUNCTION markup_command_basic_arguments {
 		$$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
 	}
+	| markup_scm MARKUP_IDENTIFIER
+	{
+		$$ = $2;
+	}
 	;
 
 markup:
@@ -2806,7 +3143,7 @@ Lily_parser::set_yydebug (bool x)
 void
 Lily_parser::do_yyparse ()
 {
-	yyparse ((void*)this);
+	yyparse (this);
 }
 
 
@@ -2857,9 +3194,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		unsmob_music (*destination)->
 			set_property ("origin", make_input (last_input_));
 
-		bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
-			!= SCM_BOOL_F;
-
+		bool is_event = mus->is_mus_type ("post-event");
 		mus->unprotect ();
 		return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
 	} else if (unsmob_pitch (sid)) {
@@ -2904,25 +3239,15 @@ get_next_unique_lyrics_context_id ()
 	return scm_from_locale_string (s);
 }
 
-SCM check_scheme_arg (Lily_parser *my_lily_parser, Input loc, SCM fallback,
+SCM check_scheme_arg (Lily_parser *parser, Input loc,
 		      SCM arg, SCM args, SCM pred)
 {
-	SCM unwrap = SCM_UNDEFINED;
+	args = scm_cons (arg, args);
 	if (scm_is_true (scm_call_1 (pred, arg)))
-		return scm_cons (arg, args);
-	unwrap = try_unpack_lyrics (pred, arg);
-	if (!SCM_UNBNDP (unwrap))
-		return scm_cons (unwrap, args);
-	if (SCM_UNBNDP (fallback)) {
-		args = scm_cons (SCM_BOOL_F, args);
-		fallback = SCM_BOOL_F;
-	} else {
-		args = scm_cons (loc_on_music (loc, fallback), args);
-		fallback = SCM_CDR (scm_last_pair (args));
-	}
+		return args;
 	scm_set_cdr_x (scm_last_pair (args), SCM_EOL);
 	MAKE_SYNTAX ("argument-error", loc, scm_length (args), pred, arg);
-	scm_set_cdr_x (scm_last_pair (args), fallback);
+	scm_set_cdr_x (scm_last_pair (args), SCM_BOOL_F);
 	return args;
 }
 
@@ -2964,19 +3289,6 @@ make_music_with_input (SCM name, Input where)
        return m;
 }
 
-SCM
-get_first_context_id (SCM type, Music *m)
-{
-	SCM id = m->get_property ("context-id");
-	if (SCM_BOOL_T == scm_equal_p (m->get_property ("context-type"), type)
-	    && scm_is_string (m->get_property ("context-id"))
-	    && scm_c_string_length (id) > 0)
-	{
-		return id;
-	}
-	return SCM_EOL;
-}
-
 SCM
 make_simple_markup (SCM a)
 {
@@ -3017,33 +3329,12 @@ make_chord_elements (SCM pitch, SCM dur, SCM modification_list)
 	return scm_call_3 (chord_ctor, pitch, dur, modification_list);
 }
 
-SCM
-try_unpack_lyrics (SCM pred, SCM arg)
-{
-	if (Music *m = unsmob_music (arg))
-		if (m->is_mus_type ("lyric-event")) {
-			SCM text = m->get_property ("text");
-			if (scm_is_true (scm_call_1 (pred, text)))
-					return text;
-			}
-	return SCM_UNDEFINED;
-}	
-
-/* Todo: actually also use apply iso. call too ...  */
-bool
-ly_input_procedure_p (SCM x)
-{
-	return ly_is_procedure (x)
-		|| (scm_is_pair (x) && ly_is_procedure (scm_car (x)));
-}
-
 int
-yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
+yylex (YYSTYPE *s, YYLTYPE *loc, Lily_parser *parser)
 {
-	Lily_parser *pars = (Lily_parser*) v;
-	Lily_lexer *lex = pars->lexer_;
+	Lily_lexer *lex = parser->lexer_;
 
-	lex->lexval_ = (void*) s;
+	lex->lexval_ = s;
 	lex->lexloc_ = loc;
 	lex->prepare_for_next_token ();
 	return lex->yylex ();