From 0da72b011d1de5f777941e6dd333be74b428f4a6 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Tue, 22 Mar 2016 13:50:01 +0100 Subject: [PATCH] Fix breakage in merge of 4798/4. Add regtest. --- input/regression/identifier-alists.ly | 20 ++++++++++++++++++++ lily/parser.yy | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 input/regression/identifier-alists.ly diff --git a/input/regression/identifier-alists.ly b/input/regression/identifier-alists.ly new file mode 100644 index 0000000000..e70713e6b0 --- /dev/null +++ b/input/regression/identifier-alists.ly @@ -0,0 +1,20 @@ +\version "2.19.39" + +\header { + texidoc = "Music variables may be structured into alists +indexed by numbers or symbols." +} + +\layout { ragged-right = ##t } + +violin.1 = { e''-\markup \typewriter "\\violin.1" } +violin.2 = { c'-\markup \typewriter "\\violin.2" } +viola.I = { e-\markup \typewriter "\\viola.I" } +viola.II = { c-\markup \typewriter "\\viola.II" } + +\score { + << + \new Staff << \violin.1 \\ \violin.2 >> + \new Staff \with { \clef "alto" } << \viola.I \\ \viola.II >> + >> +} diff --git a/lily/parser.yy b/lily/parser.yy index 6e8b1435fa..7a11d05fc9 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -4048,7 +4048,8 @@ Lily_lexer::try_special_identifiers (SCM *destination, SCM sid) *destination = unsmob (sid)->clone ()->unprotect (); return SCM_IDENTIFIER; } else if (scm_is_pair (sid) - && scm_is_true (Lily::key_list_p (sid))) { + && scm_is_pair (scm_car (sid)) + && scm_is_true (Lily::key_p (scm_caar (sid)))) { *destination = sid; return LOOKUP_IDENTIFIER; } -- 2.39.5