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

diff --git a/lily/parser.yy b/lily/parser.yy
index f901a6de0e..83eaf89ec2 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--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,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
@@ -372,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
@@ -386,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
@@ -464,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;
 		
@@ -477,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);
 	}
@@ -551,6 +574,10 @@ identifier_init:
 		$$ = $1->self_scm ();
 		$1->unprotect ();
 	}
+	| bookpart_block {
+		$$ = $1->self_scm ();
+		$1->unprotect ();
+	}
 	| output_def {
 		$$ = $1->self_scm ();
 		$1->unprotect ();
@@ -627,6 +654,7 @@ context_def_spec_body:
 book_block:
 	BOOK '{' book_body '}' 	{
 		$$ = $3;
+		pop_paper (PARSER);
 	}
 	;
 
@@ -636,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 {
@@ -649,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;
@@ -662,6 +699,10 @@ book_body:
 		scm_call_3 (proc, PARSER->self_scm (), $$->self_scm (), music->self_scm ());
 	}
 	| book_body full_markup {
+		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);
 	}
@@ -671,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;
@@ -703,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)
@@ -803,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 );
+	}
 	;
 
 /*
@@ -1890,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);
+			}
 	}
 	;
 
@@ -1904,6 +2013,9 @@ figured_bass_modification:
 	| '/'		{
 		$$ = ly_symbol2scm ("slash");
 	}
+	| E_BACKSLASH {
+		$$ = ly_symbol2scm ("backslash");
+	}
 	;
 
 br_bass_figure:
@@ -2185,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;
@@ -2216,6 +2337,9 @@ markup_list:
 	| markup_braced_list {
 		$$ = $1;
 	}
+	| markup_command_list {
+		$$ = scm_list_1 ($1);
+	}
 	;
 
 markup_composed_list:
@@ -2241,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);
@@ -2293,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);
 	}