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

diff --git a/lily/parser.yy b/lily/parser.yy
index 213f3ec539..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>
 */
 
@@ -654,6 +654,7 @@ context_def_spec_body:
 book_block:
 	BOOK '{' book_body '}' 	{
 		$$ = $3;
+		pop_paper (PARSER);
 	}
 	;
 
@@ -663,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 {
@@ -676,6 +679,7 @@ book_body:
 	| book_body paper_block {
 		$$->paper_ = $2;
 		$2->unprotect ();
+		set_paper (PARSER, $2);
 	}
 	| book_body bookpart_block {
 		Book *bookpart = $2;