X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=83eaf89ec235912c7bccb69ef2b44dd9bc6b3943;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=ebb322d7731ef9009e247d1df953896b9b71afa5;hpb=adaa7aecab8595596fc6505402b40a37a04716e6;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index ebb322d773..83eaf89ec2 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
                  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -159,6 +159,7 @@ void set_music_properties (Music *p, SCM a);
 %token ALIAS "\\alias"
 %token ALTERNATIVE "\\alternative"
 %token BOOK "\\book"
+%token BOOKPART "\\bookpart"
 %token CHANGE "\\change"
 %token CHORDMODE "\\chordmode"
 %token CHORDS "\\chords"
@@ -182,6 +183,7 @@ void set_music_properties (Music *p, SCM a);
 %token LYRICSTO "\\lyricsto"
 %token MARK "\\mark"
 %token MARKUP "\\markup"
+%token MARKUPLINES "\\markuplines"
 %token MIDI "\\midi"
 %token NAME "\\name"
 %token NOTEMODE "\\notemode"
@@ -279,7 +281,14 @@ If we give names, Bison complains.
 %token <scm> MARKUP_HEAD_SCM0_MARKUP1
 %token <scm> MARKUP_HEAD_SCM0_SCM1
 %token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2
+%token <scm> MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3
+%token <scm> MARKUP_HEAD_SCM0_MARKUP1_MARKUP2
 %token <scm> MARKUP_HEAD_SCM0_SCM1_SCM2
+%token <scm> MARKUP_LIST_HEAD_EMPTY
+%token <scm> MARKUP_LIST_HEAD_LIST0
+%token <scm> MARKUP_LIST_HEAD_SCM0
+%token <scm> MARKUP_LIST_HEAD_SCM0_LIST1
+%token <scm> MARKUP_LIST_HEAD_SCM0_SCM1_LIST2
 %token <scm> MARKUP_IDENTIFIER
 %token <scm> MUSIC_FUNCTION
 %token <scm> MUSIC_IDENTIFIER
@@ -298,9 +307,11 @@ If we give names, Bison complains.
 
 %type <book> book_block
 %type <book> book_body
+%type <book> bookpart_block
+%type <book> bookpart_body
 
 %type <i> bare_unsigned
-%type <i> figured_bass_alteration
+%type <scm> figured_bass_alteration
 %type <i> dots
 %type <i> exclamations
 %type <i> optional_rest
@@ -350,6 +361,7 @@ If we give names, Bison complains.
 %type <scm> absolute_pitch
 %type <scm> assignment_id
 %type <scm> bare_number
+%type <scm> unsigned_number
 %type <scm> bass_figure
 %type <scm> figured_bass_modification
 %type <scm> br_bass_figure
@@ -371,6 +383,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
@@ -385,6 +398,7 @@ If we give names, Bison complains.
 %type <scm> markup_braced_list
 %type <scm> markup_braced_list_body 
 %type <scm> markup_composed_list
+%type <scm> markup_command_list
 %type <scm> markup_head_1_item
 %type <scm> markup_head_1_list
 %type <scm> markup_list
@@ -409,6 +423,7 @@ If we give names, Bison complains.
 %type <scm> pitch_also_in_chords
 %type <scm> post_events
 %type <scm> property_operation
+%type <scm> property_path property_path_revved
 %type <scm> scalar
 %type <scm> script_abbreviation
 %type <scm> simple_chord_elements
@@ -462,6 +477,12 @@ toplevel_expression:
 		scm_call_2 (proc, PARSER->self_scm (), book->self_scm ());
 		book->unprotect ();
 	}
+	| bookpart_block {
+		Book *bookpart = $1;
+		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-bookpart-handler");
+		scm_call_2 (proc, PARSER->self_scm (), bookpart->self_scm ());
+		bookpart->unprotect ();
+	}
 	| score_block {
 		Score *score = $1;
 		
@@ -475,6 +496,10 @@ toplevel_expression:
 		scm_call_2 (proc, PARSER->self_scm (), music->self_scm ());
 	}
 	| full_markup {
+		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
+		scm_call_2 (proc, PARSER->self_scm (), scm_list_1 ($1));
+	}
+	| full_markup_list {
 		SCM proc = PARSER->lexer_->lookup_identifier ("toplevel-text-handler");
 		scm_call_2 (proc, PARSER->self_scm (), $1);
 	}
@@ -502,7 +527,7 @@ embedded_scm:
 
 lilypond_header_body:
 	{
-		$$ = get_header(PARSER);
+		$$ = get_header (PARSER);
 		PARSER->lexer_->add_scope ($$);
 	}
 	| lilypond_header_body assignment  {
@@ -549,6 +574,10 @@ identifier_init:
 		$$ = $1->self_scm ();
 		$1->unprotect ();
 	}
+	| bookpart_block {
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
 	| output_def {
 		$$ = $1->self_scm ();
 		$1->unprotect ();
@@ -625,6 +654,7 @@ context_def_spec_body:
 book_block:
 	BOOK '{' book_body '}' 	{
 		$$ = $3;
+		pop_paper (PARSER);
 	}
 	;
 
@@ -634,9 +664,11 @@ book_block:
 book_body:
 	{
 		$$ = new Book;
+		init_papers (PARSER);
 		$$->origin ()->set_spot (@$);
 		$$->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"); 
 	}
 	| BOOK_IDENTIFIER {
@@ -647,14 +679,32 @@ book_body:
 	| book_body paper_block {
 		$$->paper_ = $2;
 		$2->unprotect ();
+		set_paper (PARSER, $2);
+	}
+	| book_body bookpart_block {
+		Book *bookpart = $2;
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-bookpart-handler");
+		scm_call_2 (proc, $$->self_scm (), bookpart->self_scm ());
+		bookpart->unprotect ();
 	}
 	| book_body score_block {
-		SCM s = $2->self_scm ();
-		$$->add_score (s);
-		$2->unprotect();
+		Score *score = $2;
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-score-handler");
+		scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+		score->unprotect ();
+	}
+	| book_body composite_music {
+		Music *music = unsmob_music ($2);
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-music-handler");
+		scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
 	}
 	| book_body full_markup {
-		$$->add_score ($2);
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+		scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+	}
+	| book_body full_markup_list {
+		SCM proc = PARSER->lexer_->lookup_identifier ("book-text-handler");
+		scm_call_2 (proc, $$->self_scm (), $2);
 	}
 	| book_body lilypond_header {
 		$$->header_ = $2;
@@ -662,12 +712,64 @@ book_body:
 	| book_body error {
 		$$->paper_ = 0;
 		$$->scores_ = SCM_EOL;
+		$$->bookparts_ = SCM_EOL;
 	}
 	| book_body object_id_setting {
 		$$->user_key_ = ly_scm2string ($2);
 	}
 	;
 
+bookpart_block:
+	BOOKPART '{' bookpart_body '}' {
+		$$ = $3;
+	}
+	;
+
+bookpart_body:
+	{
+		$$ = new Book;
+		$$->origin ()->set_spot (@$);
+	}
+	| BOOK_IDENTIFIER {
+		$$ = unsmob_book ($1);
+		$$->protect ();
+		$$->origin ()->set_spot (@$);
+	}
+	| bookpart_body paper_block {
+		$$->paper_ = $2;
+		$2->unprotect ();
+	}
+	| bookpart_body score_block {
+		Score *score = $2;
+		SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-score-handler");
+		scm_call_2 (proc, $$->self_scm (), score->self_scm ());
+		score->unprotect ();
+	}
+	| bookpart_body composite_music {
+		Music *music = unsmob_music ($2);
+		SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-music-handler");
+		scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
+	}
+	| bookpart_body full_markup {
+		SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
+		scm_call_2 (proc, $$->self_scm (), scm_list_1 ($2));
+	}
+	| bookpart_body full_markup_list {
+		SCM proc = PARSER->lexer_->lookup_identifier ("bookpart-text-handler");
+		scm_call_2 (proc, $$->self_scm (), $2);
+	}
+	| bookpart_body lilypond_header {
+		$$->header_ = $2;
+	}
+	| bookpart_body error {
+		$$->paper_ = 0;
+		$$->scores_ = SCM_EOL;
+	}
+	| bookpart_body object_id_setting {
+		$$->user_key_ = ly_scm2string ($2);
+	}
+	;
+
 score_block:
 	SCORE '{' score_body '}' 	{
 		$$ = $3;
@@ -694,7 +796,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)
@@ -794,8 +896,20 @@ output_def_body:
 
 tempo_event:
 	TEMPO steno_duration '=' bare_unsigned	{
-		$$ = MAKE_SYNTAX ("tempo", @$, $2, scm_int2num ($4));
-	}				
+		$$ = MAKE_SYNTAX ("tempo", @$, SCM_BOOL_F, $2, scm_int2num ($4));
+	}
+	| TEMPO string steno_duration '=' bare_unsigned	{
+		$$ = MAKE_SYNTAX ("tempo", @$, make_simple_markup($2), $3, scm_int2num ($5));
+	}
+	| TEMPO full_markup steno_duration '=' bare_unsigned	{
+		$$ = MAKE_SYNTAX ("tempo", @$, $2, $3, scm_int2num ($5));
+	}
+	| TEMPO string {
+		$$ = MAKE_SYNTAX ("tempoText", @$, make_simple_markup($2) );
+	}
+	| TEMPO full_markup {
+		$$ = MAKE_SYNTAX ("tempoText", @$, $2 );
+	}
 	;
 
 /*
@@ -854,9 +968,9 @@ alternative_music:
 
 
 repeated_music:
-	REPEAT simple_string bare_unsigned music alternative_music
+	REPEAT simple_string unsigned_number music alternative_music
 	{
-		$$ = MAKE_SYNTAX ("repeat", @$, $2, scm_int2num ($3), $4, $5);
+		$$ = MAKE_SYNTAX ("repeat", @$, $2, $3, $4, $5);
 	}
 	;
 
@@ -975,7 +1089,7 @@ prefix_composite_music:
 	generic_prefix_music_scm {
 		$$ = run_music_function (PARSER, $1);
 	}
-	| CONTEXT    simple_string optional_id optional_context_mod music {
+	| CONTEXT simple_string optional_id optional_context_mod music {
 		$$ = MAKE_SYNTAX ("context-specification", @$, $2, $3, $5, $4, SCM_BOOL_F);
 	}
 	| NEWCONTEXT simple_string optional_id optional_context_mod music {
@@ -1121,6 +1235,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"),
@@ -1130,13 +1260,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"),
@@ -1182,17 +1309,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),
@@ -1609,7 +1731,7 @@ direction_reqd_event:
 octave_check:
 	/**/ { $$ = SCM_EOL; }
 	| '='  { $$ = scm_from_int (0); }
-	| '=' sub_quotes { $$ = scm_from_int ($2); }
+	| '=' sub_quotes { $$ = scm_from_int (-$2); }
 	| '=' sup_quotes { $$ = scm_from_int ($2); }
 	;
 
@@ -1700,25 +1822,25 @@ gen_text_def:
 
 script_abbreviation:
 	'^'		{
-		$$ = scm_makfrom0str ("Hat");
+		$$ = scm_from_locale_string ("Hat");
 	}
 	| '+'		{
-		$$ = scm_makfrom0str ("Plus");
+		$$ = scm_from_locale_string ("Plus");
 	}
 	| '-' 		{
-		$$ = scm_makfrom0str ("Dash");
+		$$ = scm_from_locale_string ("Dash");
 	}
  	| '|'		{
-		$$ = scm_makfrom0str ("Bar");
+		$$ = scm_from_locale_string ("Bar");
 	}
 	| ANGLE_CLOSE	{
-		$$ = scm_makfrom0str ("Larger");
+		$$ = scm_from_locale_string ("Larger");
 	}
 	| '.' 		{
-		$$ = scm_makfrom0str ("Dot");
+		$$ = scm_from_locale_string ("Dot");
 	}
 	| '_' {
-		$$ = scm_makfrom0str ("Underscore");
+		$$ = scm_from_locale_string ("Underscore");
 	}
 	;
 
@@ -1823,9 +1945,9 @@ bass_number:
 	;
 
 figured_bass_alteration:
-	'-' 	{ $$ = -2; }
-	| '+'	{ $$ = 2; }
-	| '!'	{ $$ = 0; }
+	'-' 	{ $$ = ly_rational2scm (FLAT_ALTERATION); }
+	| '+'	{ $$ = ly_rational2scm (SHARP_ALTERATION); }
+	| '!'	{ $$ = scm_from_int (0); }
 	;
 
 bass_figure:
@@ -1850,11 +1972,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));
 		}
@@ -1873,6 +1995,10 @@ bass_figure:
 			{
 			m->set_property ("no-continuation", SCM_BOOL_T);
 			}
+		else if ($2 == ly_symbol2scm ("backslash"))
+			{
+			m->set_property ("augmented-slash", SCM_BOOL_T);
+			}
 	}
 	;
 
@@ -1887,6 +2013,9 @@ figured_bass_modification:
 	| '/'		{
 		$$ = ly_symbol2scm ("slash");
 	}
+	| E_BACKSLASH {
+		$$ = ly_symbol2scm ("backslash");
+	}
 	;
 
 br_bass_figure:
@@ -2134,6 +2263,14 @@ bare_unsigned:
 	}
 	;
 
+unsigned_number:
+	bare_unsigned  { $$ = scm_from_int ($1); }
+	| NUMBER_IDENTIFIER {
+		$$ = $1;
+	}
+	;
+	
+
 exclamations:
 		{ $$ = 0; }
 	| exclamations '!'	{ $$ ++; }
@@ -2160,6 +2297,15 @@ lyric_markup:
 	}
 	;
 
+full_markup_list:
+	MARKUPLINES
+		{ PARSER->lexer_->push_markup_state (); }
+	markup_list {
+		$$ = $3;
+		PARSER->lexer_->pop_state ();
+	}
+	;
+
 full_markup:
 	MARKUP_IDENTIFIER {
 		$$ = $1;
@@ -2191,6 +2337,9 @@ markup_list:
 	| markup_braced_list {
 		$$ = $1;
 	}
+	| markup_command_list {
+		$$ = scm_list_1 ($1);
+	}
 	;
 
 markup_composed_list:
@@ -2216,6 +2365,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);
@@ -2268,6 +2435,12 @@ simple_markup:
 	| MARKUP_HEAD_SCM0_SCM1 embedded_scm embedded_scm {
 		$$ = scm_list_3 ($1, $2, $3);
 	}
+	| MARKUP_HEAD_SCM0_MARKUP1_MARKUP2 embedded_scm markup markup {
+		$$ = scm_list_4 ($1, $2, $3, $4);
+	}
+	| MARKUP_HEAD_SCM0_SCM1_MARKUP2_MARKUP3 embedded_scm embedded_scm markup markup {
+		$$ = scm_list_5 ($1, $2, $3, $4, $5);
+	}
 	| MARKUP_HEAD_EMPTY {
 		$$ = scm_list_1 ($1);
 	}
@@ -2375,7 +2548,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 SCM
 get_next_unique_context_id ()
 {
-	return scm_makfrom0str ("$uniqueContextId");
+	return scm_from_locale_string ("$uniqueContextId");
 }
 
 
@@ -2385,7 +2558,7 @@ get_next_unique_lyrics_context_id ()
 	static int new_context_count;
 	char s[128];
 	snprintf (s, sizeof (s)-1, "uniqueContext%d", new_context_count++);
-	return scm_makfrom0str (s);
+	return scm_from_locale_string (s);
 }