X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=a9d8938889185e76b9b8c1537e0f9ef4555f3aaf;hb=e88eca13f1a87dbd3a57a7a492deea95b0473753;hp=5f18eef53191b046830953038da9a8c2561233ed;hpb=0c34fe54a73dec156d4ed33a47647388588385df;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 5f18eef531..a9d8938889 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -84,6 +84,7 @@ using namespace std;
 
 #include "book.hh"
 #include "context-def.hh"
+#include "context-mod.hh"
 #include "dimensions.hh"
 #include "file-path.hh"
 #include "input.hh"
@@ -198,7 +199,6 @@ void set_music_properties (Music *p, SCM a);
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
-%token OBJECTID "\\objectid"
 %token OCTAVE "\\octave"
 %token ONCE "\\once"
 %token OVERRIDE "\\override"
@@ -271,6 +271,7 @@ If we give names, Bison complains.
 %token <i> EXPECT_MARKUP;
 %token <i> EXPECT_MUSIC;
 %token <i> EXPECT_SCM;
+%token <i> EXPECT_MARKUP_LIST
 /* After the last argument. */
 %token <i> EXPECT_NO_MORE_ARGS;
 
@@ -279,28 +280,15 @@ If we give names, Bison complains.
 %token <scm> CHORD_MODIFIER
 %token <scm> CHORD_REPETITION
 %token <scm> CONTEXT_DEF_IDENTIFIER
+%token <scm> CONTEXT_MOD_IDENTIFIER
 %token <scm> DRUM_PITCH
 %token <scm> DURATION_IDENTIFIER
 %token <scm> EVENT_IDENTIFIER
 %token <scm> FRACTION
 %token <scm> LYRICS_STRING
 %token <scm> LYRIC_MARKUP_IDENTIFIER
-%token <scm> MARKUP_HEAD_EMPTY
-%token <scm> MARKUP_HEAD_LIST0
-%token <scm> MARKUP_HEAD_MARKUP0
-%token <scm> MARKUP_HEAD_MARKUP0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1
-%token <scm> MARKUP_HEAD_SCM0_SCM1
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3
-%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
-%token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
-%token <scm> MARKUP_LIST_HEAD_EMPTY
-%token <scm> MARKUP_LIST_HEAD_LIST0
-%token <scm> MARKUP_LIST_HEAD_SCM0
-%token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
-%token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
+%token <scm> MARKUP_FUNCTION
+%token <scm> MARKUP_LIST_FUNCTION
 %token <scm> MARKUP_IDENTIFIER
 %token <scm> MUSIC_FUNCTION
 %token <scm> MUSIC_IDENTIFIER
@@ -346,6 +334,7 @@ If we give names, Bison complains.
 %type <scm> chord_body_element
 %type <scm> command_element
 %type <scm> command_event
+%type <scm> context_modification
 %type <scm> context_change
 %type <scm> direction_less_event
 %type <scm> direction_reqd_event
@@ -411,6 +400,8 @@ If we give names, Bison complains.
 %type <scm> markup_braced_list_body
 %type <scm> markup_composed_list
 %type <scm> markup_command_list
+%type <scm> markup_command_list_arguments
+%type <scm> markup_command_basic_arguments
 %type <scm> markup_head_1_item
 %type <scm> markup_head_1_list
 %type <scm> markup_list
@@ -426,7 +417,6 @@ If we give names, Bison complains.
 %type <scm> number_expression
 %type <scm> number_factor
 %type <scm> number_term
-%type <scm> object_id_setting
 %type <scm> octave_check
 %type <scm> optional_context_mod
 %type <scm> optional_id
@@ -475,10 +465,6 @@ lilypond:	/* empty */
 	;
 
 
-object_id_setting:
-	OBJECTID STRING { $$ = $2; }
-	;
-
 toplevel_expression:
 	lilypond_header {
 		PARSER->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
@@ -631,6 +617,9 @@ identifier_init:
 	| DIGIT {
 		$$ = scm_from_int ($1);
 	}
+        | context_modification {
+                $$ = $1;
+        }
 	;
 
 context_def_spec_block:
@@ -663,6 +652,13 @@ context_def_spec_body:
 	| context_def_spec_body context_mod {
 		unsmob_context_def ($$)->add_context_mod ($2);
 	}
+	| context_def_spec_body context_modification {
+                Context_def *td = unsmob_context_def ($$);
+                SCM new_mods = unsmob_context_mod ($2)->get_mods ();
+                for (SCM m = new_mods; scm_is_pair (m); m = scm_cdr (m)) {
+                    td->add_context_mod (scm_car (m));
+                }
+	}
 	;
 
 
@@ -735,9 +731,6 @@ book_body:
 		$$->scores_ = SCM_EOL;
 		$$->bookparts_ = SCM_EOL;
 	}
-	| book_body object_id_setting {
-		$$->user_key_ = ly_scm2string ($2);
-	}
 	;
 
 bookpart_block:
@@ -789,9 +782,6 @@ bookpart_body:
 		$$->paper_ = 0;
 		$$->scores_ = SCM_EOL;
 	}
-	| bookpart_body object_id_setting {
-		$$->user_key_ = ly_scm2string ($2);
-	}
 	;
 
 score_block:
@@ -816,9 +806,6 @@ score_body:
 		$$->protect ();
 		$$->origin ()->set_spot (@$);
 	}
-	| score_body object_id_setting {
-		$$->user_key_ = ly_scm2string ($2);
-	}
 	| score_body lilypond_header 	{
 		$$->set_header ($2);
 	}
@@ -1023,22 +1010,45 @@ simple_music:
 	| context_change
 	;
 
+context_modification:
+        WITH { PARSER->lexer_->push_initial_state (); } '{' context_mod_list '}'
+        {
+                PARSER->lexer_->pop_state ();
+                $$ = $4;
+        }
+        | WITH CONTEXT_MOD_IDENTIFIER
+        {
+                $$ = $2;
+        }
+        | CONTEXT_MOD_IDENTIFIER
+        {
+                $$ = $1;
+        }
+        ;
+
 optional_context_mod:
-	/**/ { $$ = SCM_EOL; }
-	| WITH { PARSER->lexer_->push_initial_state (); }
-	'{' context_mod_list '}'
-	{
-		PARSER->lexer_->pop_state ();
-		$$ = $4;
-	}
-	;
+        /**/ {
+            $$ = SCM_EOL;
+        }
+        | context_modification
+        {
+              $$ = $1;
+        }
+        ;
 
 context_mod_list:
-	/* */  { $$ = SCM_EOL; }
-	| context_mod_list context_mod  {
-		 $$ = scm_cons ($2, $1);
-	}
-	;
+        /**/ {
+            $$ = Context_mod ().smobbed_copy ();
+        }
+        | context_mod_list context_mod  {
+                 unsmob_context_mod ($1)->add_context_mod ($2);
+        }
+        | context_mod_list CONTEXT_MOD_IDENTIFIER {
+                 Context_mod *md = unsmob_context_mod ($2);
+                 if (md)
+                     unsmob_context_mod ($1)->add_context_mods (md->get_mods ());
+        }
+        ;
 
 composite_music:
 	prefix_composite_music { $$ = $1; }
@@ -1056,7 +1066,7 @@ function_scm_argument:
 	;
 
 /* An argument list. If a function \foo expects scm scm music, then the lexer expands \foo into the token sequence:
- MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM
+ MUSIC_FUNCTION EXPECT_MUSIC EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS
 and this rule returns the reversed list of arguments. */
 
 function_arglist_music_last:
@@ -1120,10 +1130,18 @@ prefix_composite_music:
 		$$ = run_music_function (PARSER, $1);
 	}
 	| CONTEXT simple_string optional_id optional_context_mod music {
-		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F);
+                Context_mod *ctxmod = unsmob_context_mod ($4);
+                SCM mods = SCM_EOL;
+                if (ctxmod)
+                        mods = ctxmod->get_mods ();
+		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_F);
 	}
 	| NEWCONTEXT simple_string optional_id optional_context_mod music {
-		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_T);
+                Context_mod *ctxmod = unsmob_context_mod ($4);
+                SCM mods = SCM_EOL;
+                if (ctxmod)
+                        mods = ctxmod->get_mods ();
+		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, mods, SCM_BOOL_T);
 	}
 
 	| TIMES fraction music {
@@ -1148,7 +1166,11 @@ prefix_composite_music:
 		PARSER->lexer_->pop_state ();
 	}
 	| mode_changing_head_with_context optional_context_mod grouped_music_list {
-		$$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, $2, SCM_BOOL_T);
+                Context_mod *ctxmod = unsmob_context_mod ($2);
+                SCM mods = SCM_EOL;
+                if (ctxmod)
+                        mods = ctxmod->get_mods ();
+		$$ = MAKE_SYNTAX ("context-specification", @$, $1, SCM_EOL, $3, mods, SCM_BOOL_T);
 		if ($1 == ly_symbol2scm ("ChordNames"))
 		{
 		  $$ = MAKE_SYNTAX ("unrelativable-music", @$, $$);
@@ -1447,12 +1469,13 @@ event_chord:
 		$$ = MAKE_SYNTAX ("repetition-chord", i,
 				  PARSER->lexer_->chord_repetition_.last_chord_,
 				  PARSER->lexer_->chord_repetition_.repetition_function_,
-				  $2, $3);
+				  $2, scm_reverse_x ($3, SCM_EOL));
 	}
 	| MULTI_MEASURE_REST optional_notemode_duration post_events {
 		Input i;
 		i.set_location (@1, @3);
-		$$ = MAKE_SYNTAX ("multi-measure-rest", i, $2, $3);
+		$$ = MAKE_SYNTAX ("multi-measure-rest", i, $2,
+				  scm_reverse_x ($3, SCM_EOL));
 	}
 	| command_element
 	/* note chord elements are memorized into
@@ -1942,6 +1965,7 @@ steno_duration:
 	| DURATION_IDENTIFIER dots	{
 		Duration *d = unsmob_duration ($1);
 		Duration k (d->duration_log (), d->dot_count () + $2);
+		k = k.compressed (d->factor ());
 		*d = k;
 		$$ = $1;
 	}
@@ -2416,37 +2440,38 @@ markup_braced_list_body:
 		$$ = scm_cons ($2, $1);
 	}
 	| markup_braced_list_body markup_list {
-		$$ = scm_append_x (scm_list_2 (scm_reverse_x ($2, SCM_EOL), $1));
+		$$ = scm_reverse_x ($2, $1);
 	}
 	;
 
 markup_command_list:
-	MARKUP_LIST_HEAD_EMPTY	{
-		$$ = scm_list_1 ($1);
+	MARKUP_LIST_FUNCTION markup_command_list_arguments {
+	  $$ = scm_cons ($1, scm_reverse_x($2, SCM_EOL));
 	}
-	| MARKUP_LIST_HEAD_LIST0 markup_list	{
-		$$ = scm_list_2 ($1, $2);
+	;
+
+markup_command_basic_arguments:
+	EXPECT_MARKUP_LIST markup_command_list_arguments markup_list {
+	  $$ = scm_cons ($3, $2);
 	}
-	| MARKUP_LIST_HEAD_SCM0 embedded_scm	{
-		$$ = scm_list_2 ($1, $2);
+	| EXPECT_SCM markup_command_list_arguments embedded_scm {
+	  $$ = scm_cons ($3, $2);
 	}
-	| MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list	{
-		$$ = scm_list_3 ($1, $2, $3);
+	| EXPECT_NO_MORE_ARGS {
+	  $$ = SCM_EOL;
 	}
-	| MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list	{
-		$$ = scm_list_4 ($1, $2, $3, $4);
+	;
+
+markup_command_list_arguments:
+	markup_command_basic_arguments { $$ = $1; }
+	| EXPECT_MARKUP markup_command_list_arguments markup {
+	  $$ = scm_cons ($3, $2);
 	}
 	;
 
 markup_head_1_item:
-	MARKUP_HEAD_MARKUP0	{
-		$$ = scm_list_1 ($1);
-	}
-	| MARKUP_HEAD_SCM0_MARKUP1 embedded_scm	{
-		$$ = scm_list_2 ($1, $2);
-	}
-	| MARKUP_HEAD_SCM0_SCM1_MARKUP2 embedded_scm embedded_scm	{
-		$$ = scm_list_3 ($1, $2, $3);
+	MARKUP_FUNCTION EXPECT_MARKUP markup_command_list_arguments {
+	  $$ = scm_cons ($1, scm_reverse_x ($3, SCM_EOL));
 	}
 	;
 
@@ -2481,29 +2506,8 @@ simple_markup:
 		sc->unprotect ();
 		PARSER->lexer_->pop_state ();
 	}
-	| MARKUP_HEAD_SCM0 embedded_scm {
-		$$ = scm_list_2 ($1, $2);
-	}
-	| MARKUP_HEAD_SCM0_SCM1_SCM2 embedded_scm embedded_scm embedded_scm {
-		$$ = scm_list_4 ($1, $2, $3, $4);
-	}
-	| MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
-		$$ = scm_list_3 ($1, $2, $3);
-	}
-	| MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
-		$$ = scm_list_4 ($1, $2, $3, $4);
-	}
-	| MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup {
-		$$ = scm_list_5 ($1, $2, $3, $4, $5);
-	}
-	| MARKUP_HEAD_EMPTY {
-		$$ = scm_list_1 ($1);
-	}
-	| MARKUP_HEAD_LIST0 markup_list {
-		$$ = scm_list_2 ($1,$2);
-	}
-	| MARKUP_HEAD_MARKUP0_MARKUP1 markup markup {
-		$$ = scm_list_3 ($1, $2, $3);
+	| MARKUP_FUNCTION markup_command_basic_arguments {
+		$$ = scm_cons ($1, scm_reverse_x ($2, SCM_EOL));
 	}
 	;
 
@@ -2556,13 +2560,17 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 	} else if (scm_is_number (sid)) {
 		*destination = sid;
 		return NUMBER_IDENTIFIER;
-	} else if (unsmob_context_def (sid)) {
-		Context_def *def= unsmob_context_def (sid)->clone ();
+        } else if (unsmob_context_def (sid)) {
+                Context_def *def= unsmob_context_def (sid)->clone ();
+
+                *destination = def->self_scm ();
+                def->unprotect ();
 
-		*destination = def->self_scm ();
-		def->unprotect ();
+                return CONTEXT_DEF_IDENTIFIER;
+        } else if (unsmob_context_mod (sid)) {
+                *destination = unsmob_context_mod (sid)->smobbed_copy ();
 
-		return CONTEXT_DEF_IDENTIFIER;
+                return CONTEXT_MOD_IDENTIFIER;
 	} else if (unsmob_score (sid)) {
 		Score *score = new Score (*unsmob_score (sid));
 		*destination = score->self_scm ();