X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=462a58de402ee1f8dac8dabd827919660e015005;hb=bd6fb0b2b29864ad1738beab50939c4f9e67e7e3;hp=59cbf58502275c853ff0f07e344f8e46d1dd635f;hpb=b59eedcb6fbda723022e42121880fb8c27618eda;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 59cbf58502..462a58de40 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 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"
@@ -280,6 +281,7 @@ 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
@@ -305,6 +307,8 @@ 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 <scm> figured_bass_alteration
@@ -473,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;
 		
@@ -564,6 +574,10 @@ identifier_init:
 		$$ = $1->self_scm ();
 		$1->unprotect ();
 	}
+	| bookpart_block {
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
 	| output_def {
 		$$ = $1->self_scm ();
 		$1->unprotect ();
@@ -640,6 +654,7 @@ context_def_spec_body:
 book_block:
 	BOOK '{' book_body '}' 	{
 		$$ = $3;
+		pop_paper (PARSER);
 	}
 	;
 
@@ -649,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 {
@@ -662,6 +679,13 @@ 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 {
 		Score *score = $2;
@@ -688,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;
@@ -2362,6 +2438,9 @@ simple_markup:
 	| 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);
 	}