From: David Kastrup <dak@gnu.org>
Date: Tue, 28 Jun 2016 08:47:44 +0000 (+0200)
Subject: Issue 4908/4: Admit \header-like expression into \score
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=06732c99ce6ed25d7b8d43310cb4bb38b19fe27e;p=lilypond.git

Issue 4908/4: Admit \header-like expression into \score
---

diff --git a/lily/parser.yy b/lily/parser.yy
index 550e9ea487..f184c5acb2 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -1173,6 +1173,22 @@ score_items:
 				scm_set_cdr_x ($$, scm_cons ($2, scm_cdr ($$)));
 			else
 				$$ = scm_cons ($2, $$);
+		} else if (ly_is_module ($2)) {
+			SCM module = SCM_UNSPECIFIED;
+			if (score) {
+				module = score->get_header ();
+				if (!ly_is_module (module))
+				{
+					module = ly_make_module (false);
+					score->set_header (module);
+				}
+			} else if (scm_is_pair ($$) && ly_is_module (scm_car ($$)))
+				module = scm_car ($$);
+			else {
+				module = ly_make_module (false);
+				$$ = scm_cons (module, $$);
+			}
+			ly_module_copy (module, $2);
 		} else if (!scm_is_eq ($2, SCM_UNSPECIFIED))
 			parser->parser_error (@2, _("Spurious expression in \\score"));
 	}