X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=02599215fd509d0ad63ee98bf18e2e6be90524ab;hb=9e752ec70a160d6c3d7632036de75630438c4142;hp=db3f0ce8f9b20e0dfb07c844d1dada273f7d6846;hpb=f2ea6d166d05a6653865e18ec7aff5b81d84b5f0;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index db3f0ce8f9..02599215fd 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1,68 +1,15 @@
-%{ // -*-Fundamental-*-
-
 /*
   parser.yy -- Bison/C++ parser for LilyPond
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-/*
-FIXME:
-
-   * The rules for who is protecting what are very shady.  Uniformise
-     this.
-
-   * There are too many lexical modes?
-*/
-
-#include "config.hh"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-
-#include "book.hh"
-#include "context-def.hh"
-#include "dimensions.hh"
-#include "event.hh"
-#include "file-path.hh"
-#include "input-smob.hh"
-#include "input.hh"
-#include "lily-guile.hh"
-#include "lilypond-input-version.hh"
-#include "main.hh"
-#include "misc.hh"
-#include "lily-lexer.hh"
-#include "lily-parser.hh"
-#include "paper-book.hh"
-#include "output-def.hh"
-#include "scm-hash.hh"
-#include "scm-option.hh"
-#include "score.hh"
-#include "text-item.hh"
-#include "warn.hh"
-
-#define MY_MAKE_MUSIC(x)  make_music_by_name (ly_symbol2scm (x))
-
-Music *property_op_to_music (SCM op);
-Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops);
-SCM get_next_unique_context_id ();
-SCM get_next_unique_lyrics_context_id ();
-
-#undef _
-#if !HAVE_GETTEXT
-#define _(x) x
-#else
-#include <libintl.h>
-#define _(x) gettext (x)
-#endif
+%{
 
 #define YYERROR_VERBOSE 1
-
 #define YYPARSE_PARAM my_lily_parser
 #define YYLEX_PARAM my_lily_parser
 #define THIS\
@@ -76,186 +23,124 @@ SCM get_next_unique_lyrics_context_id ();
 	((Current).set_location ((Rhs)[1], (Rhs)[N]))
 
 
-/* Add symbols to the TAGS field of a music object.  */
+%}
 
-void
-tag_music (Music *m, SCM tag, Input ip)
-{
-	SCM tags = m->get_property ("tags");
-	if (scm_is_symbol (tag))
-		tags = scm_cons (tag, tags);
-	else if (ly_c_list_p (tag))
-		tags = ly_append2 (tag, tags);
-	else
-		ip.warning (_ ("tag must be symbol or list of symbols"));
+/* 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
+of the parse stack onto the heap. */
 
-	m->set_property ("tags", tags);
-}
+%left PREC_TOP
+%left ADDLYRICS
+%left PREC_BOT
 
-bool
-is_regular_identifier (SCM id)
-{
-  String str = ly_scm2string (id);
-  char const *s = str.to_str0 ();
+%expect 1
 
-  bool v = true;
-#if 0
-  isalpha (*s);
-  s++;
-#endif
-  while (*s && v)
-   {
-        v = v && isalnum (*s);
-        s++;
-   }
-  return v;
-}
+/* One shift/reduce problem
 
+1.  \repeat
+	\repeat .. \alternative
 
-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;
-}
+    \repeat { \repeat .. \alternative }
 
-SCM
-make_simple_markup (SCM a)
-{
-	SCM simple = ly_lily_module_constant ("simple-markup");
-	return scm_list_2 (simple, a);
-}
+or
 
-bool
-is_duration (int t)
-{
-  return t && t == 1 << intlog2 (t);
-}
+    \repeat { \repeat } \alternative 
+*/
 
-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));
-}
 
-SCM
-make_chord_step (int step, int alter)
-{
-	if (step == 7)
-		alter += FLAT;
+%pure_parser
+%locations
 
-	while (step < 0)
-		step += 7;
-	Pitch m ((step -1) / 7, (step - 1) % 7, alter);
-	return m.smobbed_copy ();
-}
 
 
-SCM
-make_chord (SCM pitch, SCM dur, SCM modification_list)
-{
-	SCM chord_ctor = ly_lily_module_constant ("construct-chord");
-	SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list);
-	scm_gc_protect_object (ch);
-	return ch;
-}
+%{ // -*-Fundamental-*-
 
-/* Todo: actually also use apply iso. call too ...  */
-bool
-ly_input_procedure_p (SCM x)
-{
-	return ly_c_procedure_p (x)
-		|| (scm_is_pair (x) && ly_c_procedure_p (scm_car (x)));
-}
+/*
+FIXME:
 
-Music*
-set_property_music (SCM sym, SCM value)
-{
-	Music *p = MY_MAKE_MUSIC ("PropertySet");
-	p->set_property ("symbol", sym);
-	p->set_property ("value", value);
-	return p;
-}
+   * The rules for who is protecting what are very shady.  Uniformise
+     this.
 
-Music*
-make_music_relative (Pitch start, Music *music)
-{
-	Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
- 	relative->set_property ("element", music->self_scm ());
-	
- 	Pitch last = music->to_relative_octave (start);
- 	if (lily_1_8_relative)
- 		music->set_property ("last-pitch", last.smobbed_copy ());
-	return relative;
-}
+   * There are too many lexical modes?
+*/
 
-Music*
-make_lyric_combine_music (SCM name, Music *music)
-{
-	Music *combine = MY_MAKE_MUSIC ("NewLyricCombineMusic");
-	combine->set_property ("element", music->self_scm ());
- 	combine->set_property ("associated-context", name);
-	return combine;
-}
+#include "config.hh"
 
-%}
+#include <cctype>
+#include <cstdlib>
+#include <cstdio>
+using namespace std;
 
-/* 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
-of the parse stack onto the heap. */
+#include "book.hh"
+#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"
+#include "music.hh"
+#include "output-def.hh"
+#include "paper-book.hh"
+#include "program-option.hh"
+#include "scm-hash.hh"
+#include "score.hh"
+#include "text-interface.hh"
+#include "warn.hh"
+
+%}
 
-%left ADDLYRICS
 
 %union {
 	Book *book;
 	Output_def *outputdef;
 	SCM scm;
-	String *string;
+	std::string *string;
  	Music *music;
  	Score *score;
  	int i;
 }
-%{
-
-int
-yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
-{
-	Lily_parser *pars = (Lily_parser*) v;
-	Lily_lexer *lex = pars->lexer_;
-
-	lex->lexval = (void*) s;
-	lex->lexloc = loc;
-	lex->prepare_for_next_token ();
-	return lex->yylex ();
-}
-
-
-%}
 
-%expect 1
+%{
 
-/* One shift/reduce problem
+#define MY_MAKE_MUSIC(x)  make_music_by_name (ly_symbol2scm (x))
 
-1.  \repeat
-	\repeat .. \alternative
+Music *property_op_to_music (SCM op);
+Music *context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new);
+SCM get_next_unique_context_id ();
+SCM get_next_unique_lyrics_context_id ();
 
-    \repeat { \repeat .. \alternative }
+#undef _
+#if !HAVE_GETTEXT
+#define _(x) x
+#else
+#include <libintl.h>
+#define _(x) gettext (x)
+#endif
 
-or
 
-    \repeat { \repeat } \alternative 
-*/
 
+Music *make_lyric_combine_music (SCM name, Music *music);
+Music *make_music_relative (Pitch start, Music *music);
+Music *run_music_function (Lily_parser *, SCM expr);
+Music *set_property_music (SCM sym, SCM value);
+SCM get_first_context_id (SCM type, Music *m);
+SCM make_chord (SCM pitch, SCM dur, SCM modification_list);
+SCM make_chord_step (int step, int alter);
+SCM make_simple_markup (SCM a);
+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);
+void set_music_properties (Music *p, SCM a);
 
-%pure_parser
-%locations
+%}
 
 /* The third option is an alias that will be used to display the
    syntax error.  Bison CVS now correctly handles backslash escapes.
@@ -270,15 +155,14 @@ or
 %token ADDQUOTE "\\addquote"
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
-%token BAR "\\bar"
 %token BOOK "\book"
 %token CHANGE "\\change"
 %token CHORDMODE "\\chordmode"
 %token CHORDS "\\chords"
-%token CLEF "\\clef"
 %token CONSISTS "\\consists"
 %token CONTEXT "\\context"
 %token DEFAULT "\\default"
+%token DEFAULTCHILD "\\defaultchild"
 %token DENIES "\\denies"
 %token DESCRIPTION "\\description"
 %token DRUMMODE "\\drummode"
@@ -314,7 +198,6 @@ or
 %token SET "\\set"
 %token SIMULTANEOUS "\\simultaneous"
 %token SKIP "\\skip"
-%token TAG "\\tag"
 %token TEMPO "\\tempo"
 %token TIMES "\\times"
 %token TRANSPOSE "\\transpose"
@@ -346,15 +229,12 @@ or
 %token E_OPEN "\\("
 %token E_BRACKET_CLOSE "\\]"
 %token E_ANGLE_OPEN "\\<"
+%token E_PLUS "\\+"
 %token E_TILDE "\\~"
 %token EXTENDER "__"
-/*  These used at all?
-  %token FIGURE_BRACKET_CLOSE 
-  %token FIGURE_BRACKET_OPEN
-
-parser.yy:348.8-25: warning: symbol `"\\>"' used more than once as a literal string
-parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal string
 
+/*
+If we give names, Bison complains.
 */
 %token FIGURE_CLOSE /* "\\>" */
 %token FIGURE_OPEN /* "\\<" */
@@ -362,7 +242,6 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %token HYPHEN "--"
 
 %token CHORDMODIFIERS
-%token COMMANDSPANREQUEST
 %token LYRIC_MARKUP
 %token MULTI_MEASURE_REST
 %token SCM_T
@@ -372,8 +251,7 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %token <i> E_UNSIGNED
 %token <i> UNSIGNED
 
-%token <id> IDENTIFIER
-
+%token <scm> BOOK_IDENTIFIER
 %token <scm> CHORDMODIFIER_PITCH
 %token <scm> CHORD_MODIFIER
 %token <scm> CONTEXT_DEF_IDENTIFIER
@@ -406,6 +284,7 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %token <scm> MUSIC_FUNCTION_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_IDENTIFIER
 %token <scm> NOTENAME_PITCH
 %token <scm> NUMBER_IDENTIFIER
@@ -423,9 +302,8 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <book> book_block
 %type <book> book_body
 
-%type <i> bare_int
 %type <i> bare_unsigned
-%type <i> bass_mod
+%type <i> figured_bass_alteration
 %type <i> dots
 %type <i> exclamations
 %type <i> optional_rest
@@ -436,7 +314,6 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <i> tremolo_type
 
 %type <music> Composite_music
-%type <music> Generic_prefix_music
 %type <music> Grouped_music_list
 %type <music> Music
 %type <music> Prefix_composite_music
@@ -447,7 +324,7 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <music> chord_body
 %type <music> chord_body_element
 %type <music> command_element
-%type <music> command_req
+%type <music> command_event
 %type <music> context_change
 %type <music> direction_less_event
 %type <music> direction_reqd_event
@@ -460,12 +337,12 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <music> relative_music
 %type <music> simple_element
 %type <music> string_number_event
-%type <music> tagged_post_event
 %type <music> tempo_event
 %type <music> toplevel_music
 
 %type <outputdef> output_def_body
 %type <outputdef> output_def_head
+%type <outputdef> output_def_head_with_mode_switch
 %type <outputdef> output_def
 %type <outputdef> paper_block 
 
@@ -475,9 +352,12 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %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> bass_figure
-%type <scm> bass_number
+%type <scm> figured_bass_modification
 %type <scm> br_bass_figure
+%type <scm> bass_number
 %type <scm> chord_body_elements
 %type <scm> chord_item
 %type <scm> chord_items
@@ -519,6 +399,7 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <scm> object_id_setting
 %type <scm> octave_check
 %type <scm> optional_context_mod
+%type <scm> optional_id
 %type <scm> optional_notemode_duration
 %type <scm> pitch
 %type <scm> pitch_also_in_chords
@@ -534,6 +415,7 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str
 %type <scm> step_number
 %type <scm> step_numbers 
 %type <scm> string
+%type <scm> function_scm_argument
 
 %type <score> score_block
 %type <score> score_body
@@ -568,29 +450,26 @@ object_id_setting:
 
 toplevel_expression:
 	lilypond_header {
-		THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
-	}
-	| add_quote {
-	
+		THIS->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
 	}
 	| book_block {
 		Book *book = $1;
 		SCM proc = THIS->lexer_->lookup_identifier ("toplevel-book-handler");
 		scm_call_2 (proc, THIS->self_scm (), book->self_scm ());
- 		scm_gc_unprotect_object (book->self_scm ());
+		book->unprotect ();
 	}
 	| score_block {
 		Score *score = $1;
 		
 		SCM proc = THIS->lexer_->lookup_identifier ("toplevel-score-handler");
 		scm_call_2 (proc, THIS->self_scm (), score->self_scm ());
- 		scm_gc_unprotect_object (score->self_scm ());
+		score->unprotect ();
 	}
 	| toplevel_music {
 		Music *music = $1;
 		SCM proc = THIS->lexer_->lookup_identifier ("toplevel-music-handler");
 		scm_call_2 (proc, THIS->self_scm (), music->self_scm ());
- 		scm_gc_unprotect_object (music->self_scm ());
+		music->unprotect (); 
 	}
 	| full_markup {
 		SCM proc = THIS->lexer_->lookup_identifier ("toplevel-text-handler");
@@ -608,7 +487,7 @@ toplevel_expression:
 			id = ly_symbol2scm ("$defaultlayout");
 
 		THIS->lexer_->set_identifier (id, od->self_scm ());
-		scm_gc_unprotect_object (od->self_scm ());
+		od->unprotect();
 	}
 	;
 
@@ -625,7 +504,7 @@ embedded_scm:
 
 lilypond_header_body:
 	{
-		$$ = ly_make_anonymous_module (be_safe_global);
+		$$ = get_header(THIS);
 		THIS->lexer_->add_scope ($$);
 	}
 	| lilypond_header_body assignment  {
@@ -651,9 +530,13 @@ 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
 		}
 
+
 	        THIS->lexer_->set_identifier ($1, $3);
 
 /*
@@ -671,22 +554,26 @@ all objects can be unprotected as soon as they're here.
 identifier_init:
 	score_block {
 		$$ = $1->self_scm ();
-		scm_gc_unprotect_object ($$);
+		$1->unprotect ();
+	}
+	| book_block {
+		$$ = $1->self_scm ();
+		$1->unprotect ();
 	}
 	| output_def {
 		$$ = $1->self_scm ();
-		scm_gc_unprotect_object ($$);
+		$1->unprotect ();
 	}
 	| context_def_spec_block {
 		$$ = $1;
 	}
 	| Music  {
 		$$ = $1->self_scm ();
-		scm_gc_unprotect_object ($$);
+		$1->unprotect();
 	}
 	| post_event {
 		$$ = $1->self_scm ();
-		scm_gc_unprotect_object ($$);
+		$1->unprotect();
 	}
 	| number_expression {
  		$$ = $1;
@@ -701,7 +588,7 @@ identifier_init:
 		$$ = $1;
 	}
 	| DIGIT {
-		$$ = scm_int2num ($1);
+		$$ = scm_from_int ($1);
 	}
 	;
 
@@ -753,17 +640,21 @@ book_body:
 		$$ = new Book;
 		$$->set_spot (@$);
 		$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
-		scm_gc_unprotect_object ($$->paper_->self_scm ());
-		$$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); 
+		$$->paper_->unprotect ();
+		$$->header_ = THIS->lexer_->lookup_identifier ("$defaultheader"); 
+	}
+	| BOOK_IDENTIFIER {
+		$$ = unsmob_book ($1);
+		$$->set_spot (@$);
 	}
 	| book_body paper_block {
 		$$->paper_ = $2;
-		scm_gc_unprotect_object ($2->self_scm ());
+		$2->unprotect ();
 	}
 	| book_body score_block {
 		SCM s = $2->self_scm ();
 		$$->add_score (s);
-		scm_gc_unprotect_object (s);
+		$2->unprotect();
 	}
 	| book_body full_markup {
 		$$->add_score ($2);
@@ -787,22 +678,24 @@ score_block:
 	;
 
 score_body:
-	/**/	{
-		$$ = new Score;
+	Music {
+		SCM m = $1->self_scm ();
+		$1->unprotect();
+		SCM scorify = ly_lily_module_constant ("scorify-music");
+		SCM score = scm_call_2 (scorify, m, THIS->self_scm ());
+
+		// pass ownernship to C++ again.
+		$$ = unsmob_score (score);
+		$$->protect ();
 		$$->set_spot (@$);
 	}
 	| SCORE_IDENTIFIER {
-		$$ = new Score ( *unsmob_score ($1));
+		$$ = unsmob_score ($1);
 		$$->set_spot (@$);
 	}
 	| score_body object_id_setting {
 		$$->user_key_ = ly_scm2string ($2);
 	}
-	| score_body Music {
-		SCM m = $2->self_scm ();
-		scm_gc_unprotect_object (m);
-		$$->set_music (m, THIS->self_scm ());
-	}
 	| score_body lilypond_header 	{
 		$$->header_ = $2;
 	}
@@ -814,9 +707,9 @@ score_body:
 		}
 		else
 		{
-			$$->defs_.push ($2);
+			$$->add_output_def ($2);
 		}
-		scm_gc_unprotect_object ($2->self_scm ());
+		$2->unprotect ();
 	}
 	| score_body error {
 		$$->error_found_ = true;
@@ -868,21 +761,25 @@ output_def_head:
 	}
 	;
 
+output_def_head_with_mode_switch:
+	output_def_head {
+		THIS->lexer_->push_initial_state ();
+		$$ = $1;
+	}
+	;
 
 output_def_body:
-	output_def_head '{' {
+	output_def_head_with_mode_switch '{' {
 		$$ = $1;
 		$$->input_origin_.set_spot (@$);
-		THIS->lexer_->push_initial_state ();
 	}
-	| output_def_head '{' OUTPUT_DEF_IDENTIFIER 	{
-		scm_gc_unprotect_object ($1->self_scm ());
+	| output_def_head_with_mode_switch '{' OUTPUT_DEF_IDENTIFIER 	{
+		$1->unprotect ();
 		Output_def *o = unsmob_output_def ($3);
 		o->input_origin_.set_spot (@$);
 		$$ = o;
 		THIS->lexer_->remove_scope ();
 		THIS->lexer_->add_scope (o->scope_);
-		THIS->lexer_->push_initial_state ();
 	}
 	| output_def_body assignment  {
 
@@ -898,7 +795,7 @@ output_def_body:
 		int m = scm_to_int ($2->get_property ("metronome-count"));
 		Duration *d = unsmob_duration ($2->get_property ("tempo-unit"));
 		set_tempo ($$, d->get_length (), m);
-		scm_gc_unprotect_object ($2->self_scm ());
+		$2->unprotect ();
 	}
 	| output_def_body error {
 
@@ -909,7 +806,7 @@ tempo_event:
 	TEMPO steno_duration '=' bare_unsigned	{
 		$$ = MY_MAKE_MUSIC ("MetronomeChangeEvent");
 		$$->set_property ("tempo-unit", $2);
-		$$->set_property ("metronome-count", scm_int2num ( $4));
+		$$->set_property ("metronome-count", scm_from_int ( $4));
 	}
 	;
 
@@ -927,7 +824,7 @@ Music_list:
 	| Music_list Music {
 		SCM s = $$;
  		SCM c = scm_cons ($2->self_scm (), SCM_EOL);
-		scm_gc_unprotect_object ($2->self_scm ()); /* UGH */
+		$2->unprotect (); /* UGH */
 
 		if (scm_is_pair (scm_cdr (s)))
 			scm_set_cdr_x (scm_cdr (s), c); /* append */
@@ -944,7 +841,7 @@ Music_list:
 		m->set_property ("error-found", SCM_BOOL_T);
 		SCM s = $$;
  		SCM c = scm_cons (m->self_scm (), SCM_EOL);
-		scm_gc_unprotect_object (m->self_scm ()); /* UGH */
+		m->unprotect (); /* UGH */
 
 		if (scm_is_pair (scm_cdr (s)))
 			scm_set_cdr_x (scm_cdr (s), c); /* append */
@@ -972,6 +869,7 @@ Alternative_music:
 Repeated_music:
 	REPEAT simple_string bare_unsigned Music Alternative_music
 	{
+		/*TODO: move to Scheme.*/
 		Music *beg = $4;
 		int times = $3;
 		SCM alts = scm_is_pair ($5) ? scm_car ($5) : SCM_EOL;
@@ -987,17 +885,17 @@ Repeated_music:
 		SCM proc = ly_lily_module_constant ("make-repeated-music");
 
 		SCM mus = scm_call_1 (proc, $2);
-		scm_gc_protect_object (mus); // UGH.
 		Music *r = unsmob_music (mus);
+		r->protect ();
 		if (beg)
 			{
 			r-> set_property ("element", beg->self_scm ());
-			scm_gc_unprotect_object (beg->self_scm ());
+			beg->unprotect ();
 			}
-		r->set_property ("repeat-count", scm_int2num (times >? 1));
+		r->set_property ("repeat-count", scm_from_int (max (times, 1)));
 
 		r-> set_property ("elements",alts);
-		if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {
+		if (ly_is_equal ($2, scm_makfrom0str ("tremolo"))) {
 			/*
 			TODO: move this code to Scheme.
 			*/
@@ -1019,7 +917,7 @@ Repeated_music:
 				shift -= 1;
 				r->compress (Moment (Rational (1, list_len)));
 			}
-			scm_call_3 (func, r->self_scm (), scm_int2num (shift), scm_int2num (dots));
+			scm_call_3 (func, r->self_scm (), scm_from_int (shift), scm_from_int (dots));
 
 		}
 		r->set_spot (*$4->origin ());
@@ -1064,7 +962,6 @@ Simple_music:
 	| context_change
 	;
 
-
 optional_context_mod:
 	/**/ { $$ = SCM_EOL; }
 	| WITH { THIS->lexer_->push_initial_state (); }
@@ -1082,7 +979,6 @@ context_mod_list:
 	}
 	;
 
-
 Composite_music:
 	Prefix_composite_music { $$ = $1; }
 	| Grouped_music_list { $$ = $1; }
@@ -1093,120 +989,95 @@ Grouped_music_list:
 	| Sequential_music		{ $$ = $1; }
 	;
 
+function_scm_argument:
+	embedded_scm  
+	| simple_string
+	;
+
 Generic_prefix_music_scm:
 	MUSIC_FUNCTION {
 		$$ = scm_list_2 ($1, make_input (@$));
 	}
-	| MUSIC_FUNCTION_SCM embedded_scm {
+	| 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_MUSIC Music {
-		$$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
-		scm_gc_unprotect_object ($2->self_scm ());
-	}
-	| MUSIC_FUNCTION_SCM_MUSIC embedded_scm Music {
+
+	| MUSIC_FUNCTION_SCM_MUSIC function_scm_argument Music {
 		$$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
-		scm_gc_unprotect_object ($3->self_scm ());
+		$3->unprotect ();
+	}
+	| MUSIC_FUNCTION_SCM_SCM function_scm_argument function_scm_argument {
+		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
+	}
+	| MUSIC_FUNCTION_SCM_SCM_SCM function_scm_argument function_scm_argument function_scm_argument {
+		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4);
 	}
-	| MUSIC_FUNCTION_SCM_SCM embedded_scm embedded_scm {
-		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
+	| MUSIC_FUNCTION_MUSIC Music {
+		$$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
+		$2->unprotect ();
 	}
-	| MUSIC_FUNCTION_SCM_SCM_MUSIC embedded_scm embedded_scm Music {
+	| MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument Music {
 		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
 	}
 	| MUSIC_FUNCTION_MARKUP_MUSIC full_markup Music {
 		$$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
-		scm_gc_unprotect_object ($3->self_scm ());
+		$3->unprotect ();
 	}
 	| MUSIC_FUNCTION_MARKUP_MARKUP full_markup full_markup {
 		$$ = scm_list_4 ($1, make_input (@$), $2, $3);
 	}
 	| MUSIC_FUNCTION_MUSIC_MUSIC Music Music {
 		$$ = scm_list_4 ($1, make_input (@$), $2->self_scm (), $3->self_scm ());
-		scm_gc_unprotect_object ($2->self_scm ());
-		scm_gc_unprotect_object ($3->self_scm ());
+		$2->unprotect ();
+		$3->unprotect ();
 	}
-	| MUSIC_FUNCTION_SCM_MUSIC_MUSIC embedded_scm Music Music {
+	| MUSIC_FUNCTION_SCM_MUSIC_MUSIC function_scm_argument Music Music {
 		$$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
-		scm_gc_unprotect_object ($4->self_scm ());
-		scm_gc_unprotect_object ($3->self_scm ());
+		$4->unprotect ();
+		$3->unprotect ();
 	}
 	| MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC full_markup Music Music {
 		$$ = scm_list_5 ($1, make_input (@$), $2, $3->self_scm (), $4->self_scm ());
-		scm_gc_unprotect_object ($3->self_scm ());
-		scm_gc_unprotect_object ($4->self_scm ());
+		$3->unprotect ();
+		$4->unprotect ();
 	}
 	;
 
-Generic_prefix_music:
-	Generic_prefix_music_scm {
-		SCM func = scm_car ($1);
-		Input *loc = unsmob_input (scm_cadr ($1));
-		SCM args = scm_cddr ($1);
-		SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
-
-		SCM type_check_proc = ly_lily_module_constant ("type-check-list");
-		bool ok  = true;
-
-		if (!to_boolean (scm_call_3  (type_check_proc, scm_cadr ($1), sig, args)))
-		{
-			THIS->error_level_ = 1;
-			ok = false;
-		}
-
-		SCM m = SCM_EOL;
-  		if (ok)
-			m = scm_apply_0 (func, scm_cons (THIS->self_scm(),
-							 scm_cdr ($1)));
-
-		if (unsmob_music (m))
-			{
-			$$ = unsmob_music (m);
-			scm_gc_protect_object (m);
-			}
-		else
-			{
-			if (ok)
- 				loc->error (_ ("music head function must return Music object")); 
-			$$ = MY_MAKE_MUSIC ("Music");
-			}
-		$$->set_spot (*loc);
+optional_id:
+	/**/ { $$ = SCM_EOL; }
+	| '=' simple_string {
+		$$ = $2;
 	}
-	;
+	;	
 
 
 Prefix_composite_music:
-	Generic_prefix_music {
-		$$ = $1;
-	}
-	| CONTEXT simple_string '=' simple_string optional_context_mod Music {
-		$$ = context_spec_music ($2, $4, $6, $5);
-
+	Generic_prefix_music_scm {
+		$$ = run_music_function (THIS, $1);
 	}
-	| CONTEXT simple_string optional_context_mod Music {
-		$$ = context_spec_music ($2, SCM_UNDEFINED, $4, $3);
+	| CONTEXT    simple_string optional_id optional_context_mod Music {
+		$$ = context_spec_music ($2, $3, $5, $4, false);
 	}
-	| NEWCONTEXT simple_string optional_context_mod Music {
-		$$ = context_spec_music ($2, get_next_unique_context_id (), $4,
-			$3);
+	| NEWCONTEXT simple_string optional_id optional_context_mod Music {
+		$$ = context_spec_music ($2, $3, $5, $4, true);
 	}
 
 	| TIMES fraction Music 	
-
 	{
-		int n = scm_to_int (scm_car ($2)); int d = scm_to_int (scm_cdr ($2));
+		int n = scm_to_int (scm_car ($2));
+		int d = scm_to_int (scm_cdr ($2));
 		Music *mp = $3;
 
 		$$= MY_MAKE_MUSIC ("TimeScaledMusic");
 		$$->set_spot (@$);
 
 		$$->set_property ("element", mp->self_scm ());
-		scm_gc_unprotect_object (mp->self_scm ());
-		$$->set_property ("numerator", scm_int2num (n));
-		$$->set_property ("denominator", scm_int2num (d));
+		mp->unprotect();
+		$$->set_property ("numerator", scm_from_int (n));
+		$$->set_property ("denominator", scm_from_int (d));
 		$$->compress (Moment (Rational (n,d)));
 
 	}
@@ -1219,7 +1090,7 @@ Prefix_composite_music:
 
 		p->transpose (pitch_interval (from, to));
 		$$->set_property ("element", p->self_scm ());
-		scm_gc_unprotect_object (p->self_scm ());
+		p->unprotect();
 	}
 	| mode_changing_head Grouped_music_list {
 		if ($1 == ly_symbol2scm ("chords"))
@@ -1227,7 +1098,7 @@ Prefix_composite_music:
 		  Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
 		  chm->set_property ("element", $2->self_scm ());
 		  $$ = chm;
-		  scm_gc_unprotect_object ($2->self_scm ());
+		  $2->unprotect();
 		}
 		else
 		{
@@ -1236,23 +1107,18 @@ Prefix_composite_music:
 		THIS->lexer_->pop_state ();
 	}
 	| mode_changing_head_with_context optional_context_mod Grouped_music_list {
-		$$ = context_spec_music ($1, get_next_unique_context_id (),
-					 $3, $2);
+		$$ = context_spec_music ($1, SCM_UNDEFINED, $3, $2, true);
 		if ($1 == ly_symbol2scm ("ChordNames"))
 		{
 		  Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic");
 		  chm->set_property ("element", $$->self_scm ());
-		  scm_gc_unprotect_object ($$->self_scm ());
+		  $$->unprotect();
 		  $$ = chm;
 		}
 		THIS->lexer_->pop_state ();
 	}
 	| relative_music	{ $$ = $1; }
 	| re_rhythmed_music	{ $$ = $1; }
-	| TAG embedded_scm Music {
-		tag_music ($3, $2, @$);
-		$$ = $3;
-	}
 	;
 
 mode_changing_head: 
@@ -1319,14 +1185,14 @@ relative_music:
 		Music *m = $3;
 		Pitch start = *unsmob_pitch ($2);
 		$$ = make_music_relative (start, m);
-		scm_gc_unprotect_object (m->self_scm ());
+		m->unprotect();
 	}
 	| RELATIVE Composite_music {
 		Music *m = $2;
 
 		Pitch middle_c (0, 0, 0);
 		$$ = make_music_relative (middle_c, m);
-		scm_gc_unprotect_object (m->self_scm ());
+		m->unprotect();
 	}
 	;
 
@@ -1357,7 +1223,7 @@ re_rhythmed_music:
 			name = get_next_unique_lyrics_context_id ();
 			voice = context_spec_music (scm_makfrom0str ("Voice"),
 						    name,
-						    voice, SCM_EOL);
+						    voice, SCM_EOL, false);
 		}
 
 		SCM context = scm_makfrom0str ("Lyrics");
@@ -1369,13 +1235,13 @@ re_rhythmed_music:
 			Music *music = unsmob_music (scm_car (s));
 			Music *com = make_lyric_combine_music (name, music);
 			Music *csm = context_spec_music (context,
-				get_next_unique_context_id (), com, SCM_EOL);
+				SCM_UNDEFINED, com, SCM_EOL, true);
 			lst = scm_cons (csm->self_scm (), lst);
 		}
 		all->set_property ("elements", scm_cons (voice->self_scm (),
 			lst));
 		$$ = all;
-		scm_gc_unprotect_object (voice->self_scm ());
+		voice->unprotect ();
 	}
 	| LYRICSTO simple_string {
 		THIS->lexer_->push_lyric_state ();
@@ -1384,7 +1250,7 @@ re_rhythmed_music:
 		Music *music = $4;
 		SCM name = $2;
 		$$ = make_lyric_combine_music (name, music);
-		scm_gc_unprotect_object (music->self_scm ());
+		music->unprotect();
 	}
 	;
 
@@ -1410,7 +1276,11 @@ property_operation:
 	}
 	| OVERRIDE simple_string embedded_scm '=' embedded_scm {
 		$$ = scm_list_4 (ly_symbol2scm ("push"),
-			scm_string_to_symbol ($2), $3, $5);
+			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);
 	}
 	| REVERT simple_string embedded_scm {
 		$$ = scm_list_3 (ly_symbol2scm ("pop"),
@@ -1423,6 +1293,7 @@ context_def_mod:
 	| REMOVE { $$ = ly_symbol2scm ("remove"); }
 
 	| ACCEPTS { $$ = ly_symbol2scm ("accepts"); }
+	| DEFAULTCHILD { $$ = ly_symbol2scm ("default-child"); }
 	| DENIES { $$ = ly_symbol2scm ("denies"); }
 
 	| ALIAS { $$ = ly_symbol2scm ("alias"); }
@@ -1457,10 +1328,17 @@ context_prop_spec:
 music_property_def:
 	OVERRIDE context_prop_spec embedded_scm '=' scalar {
 		$$ = property_op_to_music (scm_list_4 (
-			ly_symbol2scm ("poppush"),
+			ly_symbol2scm ("push"),
+			scm_cadr ($2),
+			$5, $3));
+		$$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
+	}
+	| OVERRIDE context_prop_spec embedded_scm  embedded_scm '=' scalar {
+		$$ = property_op_to_music (scm_list_5 (
+			ly_symbol2scm ("push"),
 			scm_cadr ($2),
-			$3, $5));
-		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+			$6, $4, $3));
+		$$ = context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
 	}
 	| REVERT context_prop_spec embedded_scm {
 		$$ = property_op_to_music (scm_list_3 (
@@ -1468,20 +1346,20 @@ music_property_def:
 			scm_cadr ($2),
 			$3));
 
-		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
 	}
 	| SET context_prop_spec '=' scalar {
 		$$ = property_op_to_music (scm_list_3 (
 			ly_symbol2scm ("assign"),
 			scm_cadr ($2),
 			$4));
-		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
 	}
 	| UNSET context_prop_spec {
 		$$ = property_op_to_music (scm_list_2 (
 			ly_symbol2scm ("unset"),
 			scm_cadr ($2)));
-		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL);
+		$$= context_spec_music (scm_car ($2), SCM_UNDEFINED, $$, SCM_EOL, false);
 	}
 	| ONCE music_property_def {
 		SCM e = $2->get_property ("element");
@@ -1510,6 +1388,9 @@ simple_string: STRING {
 	| LYRICS_STRING {
 		$$ = $1;
 	}
+	| STRING_IDENTIFIER {
+		$$ = $1;
+	}
 	;
 
 scalar: string {
@@ -1518,8 +1399,8 @@ scalar: string {
 	| LYRICS_STRING {
 		$$ = $1;
 	}
-        | bare_int {
-		$$ = scm_int2num ($1);
+	| bare_number {
+		$$ = $1;
 	}
         | embedded_scm {
 		$$ = $1;
@@ -1528,7 +1409,7 @@ scalar: string {
 		$$ = $1;
 	}
 	| DIGIT {
-		$$ = scm_int2num ($1);
+		$$ = scm_from_int ($1);
 	}
 	;
 
@@ -1616,7 +1497,7 @@ chord_body_elements:
 	/* empty */ 		{ $$ = SCM_EOL; }
 	| chord_body_elements chord_body_element {
 		$$ = scm_cons ($2->self_scm (), $1);
-		scm_gc_unprotect_object ($2->self_scm ());
+		$2->unprotect ();
 	}
 	;
 
@@ -1643,7 +1524,7 @@ chord_body_element:
 		if (scm_is_number (check))
 		{
 			int q = scm_to_int (check);
-			n->set_property ("absolute-octave", scm_int2num (q-1));
+			n->set_property ("absolute-octave", scm_from_int (q-1));
 		}
 
 		
@@ -1661,22 +1542,38 @@ chord_body_element:
 		}
 		$$ = n;
 	}
+	| music_function_chord_body { 
+		$$ = run_music_function (THIS, $1);
+		$$->set_spot (@$);
+	}
 	;
 
-add_quote:
-	ADDQUOTE string Music {
-		SCM adder = ly_lily_module_constant ("add-quotable");
-		
-		scm_call_2 (adder, $2, $3->self_scm ());
-		scm_gc_unprotect_object ($3->self_scm ());
+music_function_chord_body:
+	MUSIC_FUNCTION {
+		$$ = scm_list_2 ($1, make_input (@$));
+	}
+	| MUSIC_FUNCTION_MUSIC chord_body_element {
+		$$ = scm_list_3 ($1, make_input (@$),
+					$2->self_scm ());
+	}
+	| MUSIC_FUNCTION_SCM_MUSIC function_scm_argument chord_body_element {
+		$$ = scm_list_4 ($1, make_input (@$),
+					$2, $3->self_scm ());
+	}
+	| MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument
+		chord_body_element {
+
+		$$ = scm_list_5 ($1, make_input (@$),
+					$2, $3, $4->self_scm ());
 	}
 	;
 
+
 command_element:
-	command_req {
+	command_event {
 		$$ = MY_MAKE_MUSIC ("EventChord");
 		$$->set_property ("elements", scm_cons ($1->self_scm (), SCM_EOL));
-		scm_gc_unprotect_object ($1->self_scm ());
+		$1->unprotect();
 
 		$$-> set_spot (@$);
 		$1-> set_spot (@$);
@@ -1687,31 +1584,25 @@ command_element:
 		skip->set_spot (@$);
 		$$ = skip;
 	}
-	| OCTAVE pitch {
-		Music *m = MY_MAKE_MUSIC ("RelativeOctaveCheck");
-		$$ = m;
-		$$->set_spot (@$);
-		$$->set_property ("pitch", $2);
-	}
 	| E_BRACKET_OPEN {
 		Music *m = MY_MAKE_MUSIC ("LigatureEvent");
-		m->set_property ("span-direction", scm_int2num (START));
+		m->set_property ("span-direction", scm_from_int (START));
 		m->set_spot (@$);
 
 		$$ = MY_MAKE_MUSIC ("EventChord");
 		$$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
-		scm_gc_unprotect_object (m->self_scm ());
+		m->unprotect();
 		$$->set_spot (@$);
 	}
 	| E_BRACKET_CLOSE {
 		Music *m = MY_MAKE_MUSIC ("LigatureEvent");
-		m->set_property ("span-direction", scm_int2num (STOP));
+		m->set_property ("span-direction", scm_from_int (STOP));
 		m->set_spot (@$);
 
 		$$ = MY_MAKE_MUSIC ("EventChord");
 		$$->set_property ("elements", scm_cons (m->self_scm (), SCM_EOL));
 		$$->set_spot (@$);
-		scm_gc_unprotect_object (m->self_scm ());
+		m->unprotect ();
 	}
 	| E_BACKSLASH {
 		$$ = MY_MAKE_MUSIC ("VoiceSeparator");
@@ -1734,51 +1625,36 @@ command_element:
 					 sounds_as_c.smobbed_copy());
 		$$->set_spot (@$);
 		$$ = context_spec_music (ly_symbol2scm ("Staff"), SCM_UNDEFINED,
-			$$, SCM_EOL);
-	}
-	| BAR STRING  			{
-		Music *t = set_property_music (ly_symbol2scm ("whichBar"), $2);
-
-		Music *csm = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
-					t, SCM_EOL);
-		$$ = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED, csm, SCM_EOL);
-		$$->set_spot (@$);
-		t->set_spot (@$);
+			$$, SCM_EOL, false);
 	}
 	| PARTIAL duration_length  	{
 		Moment m = - unsmob_duration ($2)->get_length ();
 		Music *p = set_property_music (ly_symbol2scm ( "measurePosition"),m.smobbed_copy ());
 		p->set_spot (@$);
 		p = context_spec_music (ly_symbol2scm ("Timing"), SCM_UNDEFINED,
-					p, SCM_EOL);
+					p, SCM_EOL, false);
 		p = context_spec_music (ly_symbol2scm ("Score"), SCM_UNDEFINED,
-					p, SCM_EOL);
+					p, SCM_EOL, false);
 		$$ = p;
 	}
-	| CLEF STRING  {
-		SCM proc = ly_lily_module_constant ("make-clef-set");
 
-		SCM result = scm_call_1 (proc, $2);
-		scm_gc_protect_object (result);
-		$$ = unsmob_music (result);
-	}
 	| TIME_T fraction  {
 		SCM proc = ly_lily_module_constant ("make-time-signature-set");
 
 		SCM result = scm_apply_2   (proc, scm_car ($2), scm_cdr ($2), SCM_EOL);
-		scm_gc_protect_object (result);
 		$$ = unsmob_music (result);
+		$$->protect ();
 	}
 	| MARK scalar {
 		SCM proc = ly_lily_module_constant ("make-mark-set");
 
 		SCM result = scm_call_1 (proc, $2);
-		scm_gc_protect_object (result);
 		$$ = unsmob_music (result);
+		$$->protect ();
 	}
 	;
 
-command_req:
+command_event:
 	E_TILDE {
 		$$ = MY_MAKE_MUSIC ("PesOrFlexaEvent");
 	}
@@ -1817,28 +1693,32 @@ post_events:
 	| post_events post_event {
 		$2->set_spot (@2);
 		$$ = scm_cons ($2->self_scm (), $$);
-		scm_gc_unprotect_object ($2->self_scm ());
-	}
-	| post_events tagged_post_event {
-		$2 -> set_spot (@2);
-		$$ = scm_cons ($2->self_scm (), $$);
-		scm_gc_unprotect_object ($2->self_scm ());
+		$2->unprotect ();
 	}
 	;
 
-
-tagged_post_event:
-	'-' TAG embedded_scm post_event {
-		tag_music ($4, $3, @$);
-		$$ = $4;
+music_function_event:
+	MUSIC_FUNCTION_MUSIC post_event {
+		$$ = scm_list_3 ($1, make_input (@$), $2->self_scm ());
+	}
+	| MUSIC_FUNCTION_SCM_MUSIC function_scm_argument post_event {
+		$$ = scm_list_4 ($1, make_input (@$), $2, $3->self_scm ());
+	}
+	| MUSIC_FUNCTION_SCM_SCM_MUSIC function_scm_argument function_scm_argument post_event {
+		$$ = scm_list_5 ($1, make_input (@$), $2, $3, $4->self_scm ());
 	}
 	;
 
-
+	
 post_event:
 	direction_less_event {
 		$$ = $1;
 	}
+	| '-' music_function_event {
+		Music *mus = run_music_function (THIS, $2);
+		mus->set_spot (@1);
+		$$ = mus;
+	}
 	| HYPHEN {
 		if (!THIS->lexer_->is_lyric_state ())
 			THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
@@ -1851,12 +1731,12 @@ post_event:
 	}
 	| script_dir direction_reqd_event {
 		if ($1)
-			$2->set_property ("direction", scm_int2num ($1));
+			$2->set_property ("direction", scm_from_int ($1));
 		$$ = $2;
 	}
 	| script_dir direction_less_event {
 		if ($1)
-			$2->set_property ("direction", scm_int2num ($1));
+			$2->set_property ("direction", scm_from_int ($1));
 		$$ = $2;
 	}
 	| string_number_event
@@ -1865,7 +1745,7 @@ post_event:
 string_number_event:
 	E_UNSIGNED {
 		Music *s = MY_MAKE_MUSIC ("StringNumberEvent");
-		s->set_property ("string-number", scm_int2num ($1));
+		s->set_property ("string-number", scm_from_int ($1));
 		s->set_spot (@$);
 		$$ = s;
 	}
@@ -1925,7 +1805,7 @@ direction_less_event:
 	| tremolo_type  {
                Music *a = MY_MAKE_MUSIC ("TremoloEvent");
                a->set_spot (@$);
-               a->set_property ("tremolo-type", scm_int2num ($1));
+               a->set_property ("tremolo-type", scm_from_int ($1));
                $$ = a;
         }
 	;	
@@ -1946,9 +1826,9 @@ direction_reqd_event:
 
 octave_check:
 	/**/ { $$ = SCM_EOL; }
-	| '='  { $$ = scm_int2num (0); }
-	| '=' sub_quotes { $$ = scm_int2num ($2); }
-	| '=' sup_quotes { $$ = scm_int2num ($2); }
+	| '='  { $$ = scm_from_int (0); }
+	| '=' sub_quotes { $$ = scm_from_int ($2); }
+	| '=' sup_quotes { $$ = scm_from_int ($2); }
 	;
 
 sup_quotes:
@@ -2034,7 +1914,7 @@ gen_text_def:
 	}
 	| DIGIT {
 		Music *t = MY_MAKE_MUSIC ("FingerEvent");
-		t->set_property ("digit", scm_int2num ($1));
+		t->set_property ("digit", scm_from_int ($1));
 		t->set_spot (@$);
 		$$ = t;
 	}
@@ -2087,14 +1967,10 @@ optional_notemode_duration:
 	{
 		Duration dd = THIS->default_duration_;
 		$$ = dd.smobbed_copy ();
-
-		THIS->beam_check ($$);
 	}
 	| multiplied_duration	{
 		$$ = $1;
 		THIS->default_duration_ = *unsmob_duration ($$);
-
-		THIS->beam_check ($$);
 	}
 	;
 
@@ -2133,7 +2009,7 @@ multiplied_duration:
 fraction:
 	FRACTION { $$ = $1; }
 	| UNSIGNED '/' UNSIGNED {
-		$$ = scm_cons (scm_int2num ($1), scm_int2num ($3));
+		$$ = scm_cons (scm_from_int ($1), scm_from_int ($3));
 	}
 	;
 
@@ -2159,20 +2035,16 @@ tremolo_type:
 
 bass_number:
 	DIGIT   {
-		$$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
-		$$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
-				$$);
+		$$ = scm_from_int ($1);
 	}
 	| UNSIGNED {
-		$$ = scm_number_to_string (scm_int2num ($1), scm_int2num (10));
-		$$ = scm_list_2 (ly_lily_module_constant ("number-markup"),
-				$$);
+		$$ = scm_from_int ($1);
 	}
 	| STRING { $$ = $1; }
 	| full_markup { $$ = $1; }
 	;
 
-bass_mod:
+figured_bass_alteration:
 	'-' 	{ $$ = -2; }
 	| '+'	{ $$ = 2; }
 	| '!'	{ $$ = 0; }
@@ -2182,40 +2054,73 @@ bass_figure:
 	FIGURE_SPACE {
 		Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
 		$$ = bfr->self_scm ();
-		scm_gc_unprotect_object ($$);
+		bfr->unprotect ();
+		bfr->set_spot (@1);
 	}
 	| bass_number  {
 		Music *bfr = MY_MAKE_MUSIC ("BassFigureEvent");
 		$$ = bfr->self_scm ();
 
-		bfr->set_property ("figure", $1);
+		if (scm_is_number ($1))
+			bfr->set_property ("figure", $1);
+		else if (Text_interface::is_markup ($1))
+			bfr->set_property ("text", $1);
 
-		scm_gc_unprotect_object ($$);
+		bfr->unprotect ();
+		bfr->set_spot (@1);
+	}
+	| bass_figure ']' {
+		$$ = $1;
+		unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
 	}
-	| bass_figure bass_mod {
+	| bass_figure figured_bass_alteration {
 		Music *m = unsmob_music ($1);
 		if ($2) {
 			SCM salter = m->get_property ("alteration");
 			int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
 			m->set_property ("alteration",
-				scm_int2num (alter + $2));
+				scm_from_int (alter + $2));
 		} else {
-			m->set_property ("alteration", scm_int2num (0));
+			m->set_property ("alteration", scm_from_int (0));
 		}
 	}
+	| bass_figure figured_bass_modification  {
+		Music *m = unsmob_music ($1);
+		if ($2 == ly_symbol2scm ("plus"))
+			{
+			m->set_property ("augmented", SCM_BOOL_T);
+			}
+		else if ($2 == ly_symbol2scm ("slash"))
+			{
+			m->set_property ("diminished", SCM_BOOL_T);
+			}
+		else if ($2 == ly_symbol2scm ("exclamation"))
+			{
+			m->set_property ("no-continuation", SCM_BOOL_T);
+			}
+	}
 	;
 
-br_bass_figure:
-	'[' bass_figure {
-		$$ = $2;
-		unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
+
+figured_bass_modification:
+	E_PLUS		{
+		$$ = ly_symbol2scm ("plus");
 	}
-	| bass_figure	{
-		$$ = $1;
+	| E_EXCLAMATION {
+		$$ = ly_symbol2scm ("exclamation");
+	}
+	| '/'		{
+		$$ = ly_symbol2scm ("slash");
 	}
-	| br_bass_figure ']' {
+	;
+
+br_bass_figure:
+	bass_figure {
 		$$ = $1;
-		unsmob_music ($1)->set_property ("bracket-stop", SCM_BOOL_T);
+	}
+	| '[' bass_figure {
+		$$ = $2;
+		unsmob_music ($$)->set_property ("bracket-start", SCM_BOOL_T);
 	}
 	;
 
@@ -2260,7 +2165,7 @@ simple_element:
 		if (scm_is_number ($4))
 		{
 			int q = scm_to_int ($4);
-			n->set_property ("absolute-octave", scm_int2num (q-1));
+			n->set_property ("absolute-octave", scm_from_int (q-1));
 		}
 
 		if ($3 % 2)
@@ -2270,7 +2175,7 @@ simple_element:
 
 		Music *v = MY_MAKE_MUSIC ("EventChord");
 		v->set_property ("elements", scm_list_1 (n->self_scm ()));
-		scm_gc_unprotect_object (n->self_scm ());
+		n->unprotect ();
 
 		v->set_spot (@$);
 		n->set_spot (@$);
@@ -2283,7 +2188,7 @@ simple_element:
 
 		Music *v = MY_MAKE_MUSIC ("EventChord");
 		v->set_property ("elements", scm_list_1 (n->self_scm ()));
-		scm_gc_unprotect_object (n->self_scm ());
+		n->unprotect ();
 		v->set_spot (@$);
 		n->set_spot (@$);
 		$$ = v;
@@ -2314,27 +2219,27 @@ simple_element:
 		velt->set_property ("elements", scm_list_1 (ev->self_scm ()));
 		velt->set_spot (@$);
 
-		scm_gc_unprotect_object (ev->self_scm ());
+		ev->unprotect();
 
  		$$ = velt;
 	}
 	| MULTI_MEASURE_REST optional_notemode_duration  	{
 		SCM proc = ly_lily_module_constant ("make-multi-measure-rest");
 		SCM mus = scm_call_2 (proc, $2, make_input (@$));
-		scm_gc_protect_object (mus);
 		$$ = unsmob_music (mus);
+		$$->protect ();
 	}
 	
 	| lyric_element optional_notemode_duration 	{
 		if (!THIS->lexer_->is_lyric_state ())
 			THIS->parser_error (@1, _ ("have to be in Lyric mode for lyrics"));
 
-		Music *lreq = MY_MAKE_MUSIC ("LyricEvent");
-		lreq->set_property ("text", $1);
-		lreq->set_property ("duration",$2);
-		lreq->set_spot (@$);
+		Music *levent = MY_MAKE_MUSIC ("LyricEvent");
+		levent->set_property ("text", $1);
+		levent->set_property ("duration",$2);
+		levent->set_spot (@$);
 		Music *velt = MY_MAKE_MUSIC ("EventChord");
-		velt->set_property ("elements", scm_list_1 (lreq->self_scm ()));
+		velt->set_property ("elements", scm_list_1 (levent->self_scm ()));
 
 		$$= velt;
 	}
@@ -2350,7 +2255,7 @@ lyric_element:
 		$$ = $1;
 	}
 	| LYRICS_STRING {
-		$$ = make_simple_markup ($1);
+		$$ = $1;
 	}
 	;
 
@@ -2457,7 +2362,7 @@ number_factor:
 
 bare_number:
 	UNSIGNED	{
-		$$ = scm_int2num ($1);
+		$$ = scm_from_int ($1);
 	}
 	| REAL		{
 		$$ = $1;
@@ -2466,10 +2371,10 @@ bare_number:
 		$$ = $1;
 	}
 	| REAL NUMBER_IDENTIFIER	{
-		$$ = scm_make_real (scm_to_double ($1) *scm_to_double ($2));
+		$$ = scm_from_double (scm_to_double ($1) *scm_to_double ($2));
 	}
 	| UNSIGNED NUMBER_IDENTIFIER	{
-		$$ = scm_make_real ($1 *scm_to_double ($2));
+		$$ = scm_from_double ($1 *scm_to_double ($2));
 	}
 	;
 
@@ -2483,23 +2388,6 @@ bare_unsigned:
 	}
 	;
 
-bare_int:
-	bare_number {
-		if (scm_integer_p ($1) == SCM_BOOL_T)
-		{
-			int k = scm_to_int ($1);
-			$$ = k;
-		} else
-		{
-			THIS->parser_error (@1, _ ("need integer number arg"));
-			$$ = 0;
-		}
-	}
-	| '-' bare_int {
-		$$ = -$2;
-	}
-	;
-
 exclamations:
 		{ $$ = 0; }
 	| exclamations '!'	{ $$ ++; }
@@ -2622,7 +2510,7 @@ simple_markup:
 	} '{' score_body '}' {
 		Score * sc = $4;
 		$$ = scm_list_2 (ly_lily_module_constant ("score-markup"), sc->self_scm ());
-		scm_gc_unprotect_object (sc->self_scm ());
+		sc->unprotect ();
 		THIS->lexer_->pop_state ();
 	}
 	| MARKUP_HEAD_SCM0 embedded_scm {
@@ -2672,28 +2560,6 @@ Lily_parser::do_yyparse ()
 }
 
 
-/* FIXME: Should make this optional?  It will also complain at
-
-	[s4]
-
-which is entirely legitimate.
-
-Or we can scrap it.  Barchecks should detect wrong durations, and
-skipTypesetting speeds it up a lot.  */
-
-void
-Lily_parser::beam_check (SCM dur)
-{
-  Duration *d = unsmob_duration (dur);
-  if (unsmob_music (last_beam_start_) && d->duration_log () <= 2)
-    {
-      Music *m = unsmob_music (last_beam_start_);
-      m->origin ()->warning (_f ("suspect duration in beam: %s",
-      d->to_string ()));
-    }
-  last_beam_start_ = SCM_EOL;
-}
-
 
 
 
@@ -2709,6 +2575,9 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 	if (scm_is_string (sid)) {
 		*destination = sid;
 		return STRING_IDENTIFIER;
+	} else if (unsmob_book (sid)) {
+		*destination = unsmob_book (sid)->clone ()->self_scm ();
+		return BOOK_IDENTIFIER;
 	} else if (scm_is_number (sid)) {
 		*destination = sid;
 		return NUMBER_IDENTIFIER;
@@ -2724,8 +2593,11 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 		*destination = mus->self_scm ();
 		unsmob_music (*destination)->
 			set_property ("origin", make_input (last_input_));
-		return dynamic_cast<Event*> (mus)
-			? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
+
+		bool is_event = scm_memq (ly_symbol2scm ("event"), mus->get_property ("types"))
+			!= SCM_BOOL_F;
+
+		return is_event ? EVENT_IDENTIFIER : MUSIC_IDENTIFIER;
 	} else if (unsmob_duration (sid)) {
 		*destination = unsmob_duration (sid)->smobbed_copy ();
 		return DURATION_IDENTIFIER;
@@ -2735,7 +2607,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 
 		*destination = p->self_scm ();
 		return OUTPUT_DEF_IDENTIFIER;
-	} else if (Text_interface::markup_p (sid)) {
+	} else if (Text_interface::is_markup (sid)) {
 		*destination = sid;
 		if (is_lyric_state ())
 			return LYRIC_MARKUP_IDENTIFIER;
@@ -2753,7 +2625,7 @@ property_op_to_music (SCM op)
 	SCM symbol = scm_cadr (op);
 	SCM args = scm_cddr (op);
 	SCM grob_val = SCM_UNDEFINED;
-	SCM grob_sym = SCM_UNDEFINED;
+	SCM grob_path = SCM_UNDEFINED;
 	SCM val = SCM_UNDEFINED;
 	
 	if (tag == ly_symbol2scm ("assign"))
@@ -2763,16 +2635,16 @@ property_op_to_music (SCM op)
 		}
 	else if (tag == ly_symbol2scm ("unset"))
 		m = MY_MAKE_MUSIC ("PropertyUnset");
-	else if (tag == ly_symbol2scm ("poppush")
-		 || tag == ly_symbol2scm ("push"))
+	else if (tag == ly_symbol2scm ("push"))
 		{
 		m = MY_MAKE_MUSIC ("OverrideProperty");
-		grob_sym = scm_car (args);
-		grob_val = scm_cadr (args);
+		grob_val = scm_car (args);
+		grob_path = scm_cdr (args);
+		m->set_property ("pop-first", SCM_BOOL_T);
 		}
 	else if (tag == ly_symbol2scm ("pop")) {
 		m = MY_MAKE_MUSIC ("RevertProperty");
-		grob_sym = scm_car (args);
+		grob_path = args;
 		}
 
 	m->set_property ("symbol", symbol);
@@ -2781,38 +2653,25 @@ property_op_to_music (SCM op)
 		m->set_property ("value", val);
 	if (grob_val != SCM_UNDEFINED)
 		m->set_property ("grob-value", grob_val);
-
-	if (grob_sym != SCM_UNDEFINED)
-		{
-		bool itc = do_internal_type_checking_global;
-		/* UGH.
-		*/
-		bool autobeam = ly_c_equal_p (symbol, ly_symbol2scm ("autoBeamSettings"));
-		if (autobeam)
-			do_internal_type_checking_global = false;
-		m->set_property ("grob-property", grob_sym);
-		if (autobeam)
-			do_internal_type_checking_global = itc;
-		}
-
-	if (tag == ly_symbol2scm ("poppush"))
-		m->set_property ("pop-first", SCM_BOOL_T);
-
+	if (grob_path != SCM_UNDEFINED)
+		m->set_property ("grob-property-path", grob_path);
 
 	return m;
 }
 
 Music*
-context_spec_music (SCM type, SCM id, Music *m, SCM ops)
+context_spec_music (SCM type, SCM id, Music *m, SCM ops, bool create_new)
 {
 	Music *csm = MY_MAKE_MUSIC ("ContextSpeccedMusic");
 
 	csm->set_property ("element", m->self_scm ());
-	scm_gc_unprotect_object (m->self_scm ());
+	m->unprotect ();
 
 	csm->set_property ("context-type",
 		scm_is_symbol (type) ? type : scm_string_to_symbol (type));
 	csm->set_property ("property-operations", ops);
+	if (create_new)
+		csm->set_property ("create-new", SCM_BOOL_T);
 
 	if (scm_is_string (id))
 		csm->set_property ("context-id", id);
@@ -2831,6 +2690,174 @@ get_next_unique_lyrics_context_id ()
 {
 	static int new_context_count;
 	char s[128];
-	snprintf (s, 1024, "uniqueContext%d", new_context_count++);
+	snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++);
 	return scm_makfrom0str (s);
 }
+
+
+Music *
+run_music_function (Lily_parser *parser, SCM expr)
+{
+	SCM func = scm_car (expr);
+	Input *loc = unsmob_input (scm_cadr (expr));
+	SCM args = scm_cddr (expr);
+	SCM sig = scm_object_property (func, ly_symbol2scm ("music-function-signature"));
+
+	SCM type_check_proc = ly_lily_module_constant ("type-check-list");
+	bool ok  = true;
+
+	if (!to_boolean (scm_call_3  (type_check_proc, scm_cadr (expr), sig, args)))
+	{
+		parser->error_level_ = 1;
+		ok = false;
+	}
+
+	SCM m = SCM_EOL;
+	if (ok)
+		m = scm_apply_0 (func, scm_cons (parser->self_scm(),
+						 scm_cdr (expr)));
+
+
+	Music* retval = 0;
+	if (unsmob_music (m))
+		{
+		retval = unsmob_music (m);
+		retval->protect ();
+		}
+	else
+		{
+		if (ok)
+			loc->error (_ ("music head function must return Music object")); 
+		retval = MY_MAKE_MUSIC ("Music");
+		}
+	retval->set_spot (*loc);
+	return retval;
+}
+
+bool
+is_regular_identifier (SCM id)
+{
+  string str = ly_scm2string (id);
+  char const *s = str.c_str ();
+
+  bool v = true;
+#if 0
+  isalpha (*s);
+  s++;
+#endif
+  while (*s && v)
+   {
+        v = v && isalnum (*s);
+        s++;
+   }
+  return v;
+}
+
+
+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)
+{
+	return a;
+}
+
+bool
+is_duration (int t)
+{
+  return t && t == 1 << intlog2 (t);
+}
+
+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));
+}
+
+
+SCM
+make_chord_step (int step, int alter)
+{
+	if (step == 7)
+		alter += FLAT;
+
+	while (step < 0)
+		step += 7;
+	Pitch m ((step -1) / 7, (step - 1) % 7, alter);
+	return m.smobbed_copy ();
+}
+
+
+SCM
+make_chord (SCM pitch, SCM dur, SCM modification_list)
+{
+	SCM chord_ctor = ly_lily_module_constant ("construct-chord");
+	SCM ch = scm_call_3 (chord_ctor, pitch, dur, modification_list);
+
+	unsmob_music (ch)->protect();	
+	return ch;
+}
+
+
+/* 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)));
+}
+
+Music*
+set_property_music (SCM sym, SCM value)
+{
+	Music *p = MY_MAKE_MUSIC ("PropertySet");
+	p->set_property ("symbol", sym);
+	p->set_property ("value", value);
+	return p;
+}
+
+Music*
+make_music_relative (Pitch start, Music *music)
+{
+	Music *relative = MY_MAKE_MUSIC ("RelativeOctaveMusic");
+ 	relative->set_property ("element", music->self_scm ());
+	
+ 	Pitch last = music->to_relative_octave (start);
+ 	if (lily_1_8_relative)
+ 		music->set_property ("last-pitch", last.smobbed_copy ());
+	return relative;
+}
+
+Music *
+make_lyric_combine_music (SCM name, Music *music)
+{
+	Music *combine = MY_MAKE_MUSIC ("LyricCombineMusic");
+	combine->set_property ("element", music->self_scm ());
+ 	combine->set_property ("associated-context", name);
+	return combine;
+}
+
+
+int
+yylex (YYSTYPE *s, YYLTYPE *loc, void *v)
+{
+	Lily_parser *pars = (Lily_parser*) v;
+	Lily_lexer *lex = pars->lexer_;
+
+	lex->lexval = (void*) s;
+	lex->lexloc = loc;
+	lex->prepare_for_next_token ();
+	return lex->yylex ();
+}