From: Nicolas Sceaux <nicolas.sceaux@free.fr>
Date: Sun, 16 Nov 2008 19:45:37 +0000 (+0100)
Subject: Nested bookparts: fix $papers pop in case of \book block with identifier
X-Git-Tag: release/2.11.65-1~51^2~2^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bac26647e4febc81786565b02468f122c5a26b11;p=lilypond.git

Nested bookparts: fix $papers pop in case of \book block with identifier
---

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index c46224fbbc..afd401baa9 100644
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -257,8 +257,9 @@ push_paper (Lily_parser *parser, Output_def *paper)
 void
 pop_paper (Lily_parser *parser)
 {
-  parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
-                                  scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
+  if (! scm_is_null (parser->lexer_->lookup_identifier ("$papers")))
+    parser->lexer_->set_identifier (ly_symbol2scm ("$papers"),
+                                    scm_cdr (parser->lexer_->lookup_identifier ("$papers")));
 }
 
 /* Change the paper on top of $papers stack */