X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fparser.yy;h=3b690e8980890b7ef3900723e8bf97ec8b6c7c60;hb=f4ef13231b5a1cab684c424a173abcae87b0be2c;hp=0d42a60a18ea1663bc3a5f1bd260de0457ca208c;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 0d42a60a18..3b690e8980 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -182,6 +182,7 @@ void set_music_properties (Music *p, SCM a);
 %token LYRICSTO "\\lyricsto"
 %token MARK "\\mark"
 %token MARKUP "\\markup"
+%token MARKUPLINES "\\markuplines"
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
@@ -279,7 +280,13 @@ If we give names, Bison complains.
 %token <scm> MARKUP_HEAD_SCM0_MARKUP1
 %token <scm> MARKUP_HEAD_SCM0_SCM1
 %token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
+%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
 %token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_LIST_HEAD_EMPTY
+%token <scm> MARKUP_LIST_HEAD_LIST0
+%token <scm> MARKUP_LIST_HEAD_SCM0
+%token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
+%token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
 %token <scm> MARKUP_IDENTIFIER
 %token <scm> MUSIC_FUNCTION
 %token <scm> MUSIC_IDENTIFIER
@@ -300,7 +307,7 @@ If we give names, Bison complains.
 %type <book> book_body
 
 %type <i> bare_unsigned
-%type <i> figured_bass_alteration
+%type <scm> figured_bass_alteration
 %type <i> dots
 %type <i> exclamations
 %type <i> optional_rest
@@ -372,6 +379,7 @@ If we give names, Bison complains.
 %type <scm> figure_spec
 %type <scm> fraction
 %type <scm> full_markup
+%type <scm> full_markup_list
 %type <scm> function_scm_argument
 %type <scm> function_arglist
 %type <scm> function_arglist_music_last
@@ -386,6 +394,7 @@ If we give names, Bison complains.
 %type <scm> markup_braced_list
 %type <scm> markup_braced_list_body 
 %type <scm> markup_composed_list
+%type <scm> markup_command_list
 %type <scm> markup_head_1_item
 %type <scm> markup_head_1_list
 %type <scm> markup_list
@@ -410,6 +419,7 @@ If we give names, Bison complains.
 %type <scm> pitch_also_in_chords
 %type <scm> post_events
 %type <scm> property_operation
+%type <scm> property_path property_path_revved
 %type <scm> scalar
 %type <scm> script_abbreviation
 %type <scm> simple_chord_elements
@@ -476,6 +486,10 @@ toplevel_expression:
 		scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
 	}
 	| full_markup {
+		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
+		scm_call_2 (proc, PARSER->self_scm (), scm_list_1 ($1));
+	}
+	| full_markup_list {
 		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
 		scm_call_2 (proc, PARSER->self_scm (), $1);
 	}
@@ -650,12 +664,23 @@ book_body:
 		$2->unprotect ();
 	}
 	| book_body score_block {
-		SCM s = $2->self_scm ();
-		$$->add_score (s);
-		$2->unprotect();
+		Score *score = $2;
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
+		scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+		score->unprotect ();
+	}
+	| book_body composite_music {
+		Music *music = unsmob_music ($2);
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler");
+		scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
 	}
 	| book_body full_markup {
-		$$->add_score ($2);
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+		scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+	}
+	| book_body full_markup_list {
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+		scm_call_2 (proc, $$->self_scm (), $2);
 	}
 	| book_body lilypond_header {
 		$$->header_ = $2;
@@ -695,7 +720,7 @@ score_body:
 		$$->user_key_ = ly_scm2string ($2);
 	}
 	| score_body lilypond_header 	{
-		$$->header_ = $2;
+		$$->set_header ($2);
 	}
 	| score_body output_def {
 		if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)
@@ -1122,6 +1147,22 @@ context_change:
 	}
 	;
 
+
+property_path_revved:
+	embedded_scm {
+		$$ = scm_cons ($1, SCM_EOL);
+	}
+	| property_path_revved embedded_scm {
+		$$ = scm_cons ($2, $1);
+	}
+	;
+
+property_path:
+	property_path_revved  {
+		$$ = scm_reverse_x ($1, SCM_EOL);
+	} 
+	;
+
 property_operation:
 	STRING '=' scalar {
 		$$ = scm_list_3 (ly_symbol2scm ("assign"),
@@ -1131,13 +1172,10 @@ property_operation:
 		$$ = scm_list_2 (ly_symbol2scm ("unset"),
 			scm_string_to_symbol ($2));
 	}
-	| OVERRIDE simple_string embedded_scm '=' embedded_scm {
-		$$ = scm_list_4 (ly_symbol2scm ("push"),
-			scm_string_to_symbol ($2), $5, $3);
-	}
-	| OVERRIDE simple_string embedded_scm embedded_scm '=' embedded_scm {
-		$$ = scm_list_5 (ly_symbol2scm ("push"),
-				scm_string_to_symbol ($2), $6, $4, $3);
+	| OVERRIDE simple_string property_path '=' embedded_scm {
+		$$ = scm_append (scm_list_2 (scm_list_3 (ly_symbol2scm ("push"),
+							scm_string_to_symbol ($2), $5),
+					     $3));
 	}
 	| REVERT simple_string embedded_scm {
 		$$ = scm_list_3 (ly_symbol2scm ("pop"),
@@ -1183,17 +1221,12 @@ context_prop_spec:
 	;
 
 simple_music_property_def:
-	OVERRIDE context_prop_spec embedded_scm '=' scalar {
-		$$ = scm_list_5 (scm_car ($2),
-			ly_symbol2scm ("OverrideProperty"),
-			scm_cadr ($2),
-			$5, $3);
-	}
-	| OVERRIDE context_prop_spec embedded_scm  embedded_scm '=' scalar {
-		$$ = scm_list_n (scm_car ($2),			
-			ly_symbol2scm ("OverrideProperty"),
-			scm_cadr ($2),
-			$6, $4, $3, SCM_UNDEFINED);
+	OVERRIDE context_prop_spec property_path '=' scalar {
+		$$ = scm_append (scm_list_2 (scm_list_n (scm_car ($2),			
+				ly_symbol2scm ("OverrideProperty"),
+				scm_cadr ($2),
+				$5, SCM_UNDEFINED),
+				$3));
 	}
 	| REVERT context_prop_spec embedded_scm {
 		$$ = scm_list_4 (scm_car ($2),
@@ -1824,9 +1857,9 @@ bass_number:
 	;
 
 figured_bass_alteration:
-	'-' 	{ $$ = -2; }
-	| '+'	{ $$ = 2; }
-	| '!'	{ $$ = 0; }
+	'-' 	{ $$ = ly_rational2scm (FLAT_ALTERATION); }
+	| '+'	{ $$ = ly_rational2scm (SHARP_ALTERATION); }
+	| '!'	{ $$ = scm_from_int (0); }
 	;
 
 bass_figure:
@@ -1851,11 +1884,11 @@ bass_figure:
 	}
 	| bass_figure figured_bass_alteration {
 		Music *m = unsmob_music ($1);
-		if ($2) {
+		if (scm_to_double ($2)) {
 			SCM salter = m->get_property ("alteration");
-			int alter = scm_is_number (salter) ? scm_to_int (salter) : 0;
+			SCM alter = scm_is_number (salter) ? salter : scm_from_int (0);
 			m->set_property ("alteration",
-				scm_from_int (alter + $2));
+					 scm_sum (alter, $2));
 		} else {
 			m->set_property ("alteration", scm_from_int (0));
 		}
@@ -2169,6 +2202,15 @@ lyric_markup:
 	}
 	;
 
+full_markup_list:
+	MARKUPLINES
+		{ PARSER->lexer_->push_markup_state (); }
+	markup_list {
+		$$ = $3;
+		PARSER->lexer_->pop_state ();
+	}
+	;
+
 full_markup:
 	MARKUP_IDENTIFIER {
 		$$ = $1;
@@ -2200,6 +2242,9 @@ markup_list:
 	| markup_braced_list {
 		$$ = $1;
 	}
+	| markup_command_list {
+		$$ = scm_list_1 ($1);
+	}
 	;
 
 markup_composed_list:
@@ -2225,6 +2270,24 @@ markup_braced_list_body:
 	}
 	;
 
+markup_command_list:
+	MARKUP_LIST_HEAD_EMPTY	{
+		$$ = scm_list_1 ($1);
+	}
+	| MARKUP_LIST_HEAD_LIST0 markup_list	{
+		$$ = scm_list_2 ($1, $2);
+	}
+	| MARKUP_LIST_HEAD_SCM0 embedded_scm	{
+		$$ = scm_list_2 ($1, $2);
+	}
+	| MARKUP_LIST_HEAD_SCM0_LIST1 embedded_scm markup_list	{
+		$$ = scm_list_3 ($1, $2, $3);
+	}
+	| MARKUP_LIST_HEAD_SCM0_SCM1_LIST2 embedded_scm embedded_scm markup_list	{
+		$$ = scm_list_4 ($1, $2, $3, $4);
+	}
+	;
+
 markup_head_1_item:
 	MARKUP_HEAD_MARKUP0	{
 		$$ = scm_list_1 ($1);
@@ -2277,6 +2340,9 @@ simple_markup:
 	| MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
 		$$ = scm_list_3 ($1, $2, $3);
 	}
+	| MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
+		$$ = scm_list_4 ($1, $2, $3, $4);
+	}
 	| MARKUP_HEAD_EMPTY {
 		$$ = scm_list_1 ($1);
 	}