From 99cdab1574d096dc4906e3f5d2c4f79cbc409761 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Thu, 3 Jul 2014 10:22:37 +0200 Subject: [PATCH] Issue 3986: \displayScheme broken \displayScheme \markup \null failed because a markup following an omitted optional argument (here the optional output port) was backed up erroneously with the token type LYRIC_ELEMENT only to be used in lyrics mode. The optional argument was introduced with issue 2067 in version 2.19.0. The actual underlying parser error triggered by this, however, is quite older and originates from commit d4694123961690b173377b3c3a199d5a24c66a9d Author: David Kastrup Date: Thu Nov 1 15:16:52 2012 +0100 parser/lexer: eliminate LYRIC_MARKUP as a token separate from MARKUP (2996/2) in version 2.17.9. --- lily/parser.yy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lily/parser.yy b/lily/parser.yy index 0c814a13dd..0c7b13da9b 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1744,7 +1744,7 @@ function_arglist_backup: $$ = scm_cons ($4, $3); else { $$ = scm_cons (loc_on_music (@3, $1), $3); - MYBACKUP (LYRIC_ELEMENT, $4, @4); + MYBACKUP (SCM_IDENTIFIER, $4, @4); } } | EXPECT_OPTIONAL EXPECT_SCM function_arglist_backup UNSIGNED -- 2.39.5