X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Fparser.yy;h=ddccd416581b9ff75667d7815a334e6804d12b90;hb=9468b77cb2ae93b992bfb9105016f3393d206b47;hp=d9812b1b9f1c983853e56c655201b2b40d2e16d3;hpb=ef31f0442c7be02c90b9e6b2b9e9809def42ae37;p=lilypond.git

diff --git a/lily/parser.yy b/lily/parser.yy
index d9812b1b9f..ddccd41658 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -696,6 +696,20 @@ assignment:
 		parser->lexer_->set_identifier (path, $5);
                 $$ = SCM_UNSPECIFIED;
 	}
+	| markup_mode_word '=' identifier_init
+	{
+		if (scm_is_false (Lily::markup_function_p ($3)))
+		{
+			parser->parser_error (@3, _ ("Not a markup function"));
+		} else {
+			scm_primitive_eval
+				(scm_list_3
+				 (Lily::define_markup_command,
+				  scm_string_to_symbol ($1),
+				  ly_quote_scm ($3)));
+		}
+		$$ = SCM_UNSPECIFIED;
+	}
 	;
 
 
@@ -3899,11 +3913,33 @@ markup_mode:
 	}
 	;
 
+// Sort-of ugly: We need this as markup of its own as well as in
+// markup function assignments, without triggering lookahead or the
+// '=' for assignments will be parsed in markup mode and not
+// recognized.  Worse: the next token following something like
+// \markup "string" would be parsed in markup mode as well.
+//
+// So we make a single production here that's used either in markup or
+// in assignment.
+
+markup_mode_word:
+	markup_mode markup_word
+	{
+		$$ = $2;
+		parser->lexer_->pop_state ();
+	}
+	;
+
+
 full_markup:
 	markup_mode markup_top {
 		$$ = $2;
 		parser->lexer_->pop_state ();
 	}
+	| markup_mode_word
+	{
+		$$ = make_simple_markup ($1);
+	}
 	;
 
 partial_markup:
@@ -3923,7 +3959,7 @@ markup_top:
 		$$ = scm_car (MAKE_SYNTAX (composed_markup_list,
 					   @2, $1, scm_list_1 ($2)));
 	}
-	| simple_markup	{
+	| simple_markup_noword {
 		$$ = $1;
 	}
 	;
@@ -4070,14 +4106,21 @@ markup_head_1_list:
 	}
 	;
 
+markup_word:
+	STRING
+	| SYMBOL
+	;
+
 simple_markup:
-	STRING {
-		$$ = make_simple_markup ($1);
-	}
-	| SYMBOL {
+	markup_word
+	{
 		$$ = make_simple_markup ($1);
 	}
-	| SCORE {
+	| simple_markup_noword
+	;
+
+simple_markup_noword:
+	SCORE {
 		parser->lexer_->push_note_state (Lily::pitchnames);
 	} '{' score_body '}' {
 		Score *sc = unsmob<Score> ($4);