release: 1.3.85

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 9be2c940854c4aa06e5984c719e1828054bf8a11..dfbdfd9a3629f79b452a19c79a9acd0a28b80bf3 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -39,6 +39,7 @@
 #include "identifier.hh"
 #include "version.hh"
 #include "mudela-version.hh"
+#include "translator-def.hh"
 
 void strip_trailing_white (String&);
 void strip_leading_white (String&);
@@ -325,7 +326,7 @@ HYPHEN              --
                        }
 
                char c = s[s.length_i () - 1];
-               if (c == '{' &&  c == '}') // brace open is for not confusing dumb tools.
+               if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
                        here_input ().warning (
                                "Brace found at end of lyric. Did you forget a space?");
                yylval.scm = ly_str02scm (s.ch_C ());
@@ -477,6 +478,9 @@ My_lily_lexer::scan_escaped_word (String str)
        } else if (gh_number_p (sid)) {
                yylval.scm = sid;
                return NUMBER_IDENTIFIER;
+       } else if (Translator_def* tr = unsmob_translator_def (sid)) {
+               yylval.scm = sid;
+               return TRANSLATOR_IDENTIFIER;
        } else if (Music * mus =unsmob_music (sid)) {
                yylval.scm = sid;