X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparser.yy;h=3b72ec290b2d4674412423b4bfd87c362f3f08ac;hb=8245df4f448c4c740f8c2fab9c680dfc4f595d60;hp=511351e137a1647eaea91f8b04cf2a4ed1b866f0;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index 511351e137..3b72ec290b 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -568,7 +568,7 @@ object_id_setting:
 
 toplevel_expression:
 	lilypond_header {
-		THIS->lexer_->set_identifier (ly_symbol2scm ("$globalheader"), $1);
+		THIS->lexer_->set_identifier (ly_symbol2scm ("$defaultheader"), $1);
 	}
 	| add_quote {
 	
@@ -625,7 +625,7 @@ embedded_scm:
 
 lilypond_header_body:
 	{
-		$$ = ly_make_anonymous_module (be_safe_global);
+		$$ = get_header(THIS);
 		THIS->lexer_->add_scope ($$);
 	}
 	| lilypond_header_body assignment  {
@@ -754,7 +754,7 @@ book_body:
 		$$->set_spot (@$);
 		$$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
 		$$->paper_->unprotect ();
-		$$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); 
+		$$->header_ = THIS->lexer_->lookup_identifier ("$defaultheader"); 
 	}
 	| book_body paper_block {
 		$$->paper_ = $2;
@@ -1513,6 +1513,9 @@ simple_string: STRING {
 	| LYRICS_STRING {
 		$$ = $1;
 	}
+	| STRING_IDENTIFIER {
+		$$ = $1;
+	}
 	;
 
 scalar: string {
@@ -1776,7 +1779,6 @@ command_element:
 		SCM proc = ly_lily_module_constant ("make-mark-set");
 
 		SCM result = scm_call_1 (proc, $2);
-		scm_gc_protect_object (result);
 		$$ = unsmob_music (result);
 		$$->protect ();
 	}
@@ -2698,7 +2700,7 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid)
 
 		*destination = p->self_scm ();
 		return OUTPUT_DEF_IDENTIFIER;
-	} else if (Text_interface::markup_p (sid)) {
+	} else if (Text_interface::is_markup (sid)) {
 		*destination = sid;
 		if (is_lyric_state ())
 			return LYRIC_MARKUP_IDENTIFIER;