summaryrefslogtreecommitdiff
path: root/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l')
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l12
1 files changed, 6 insertions, 6 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
index c0d68c1148f..05a96ab1fe9 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
@@ -4,7 +4,7 @@
* This file implements the score lexer.
*
* Gregorio score determination in gabc input.
- * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -57,7 +57,7 @@ static bool eof_found = false;
#define RETURN_CHARACTERS \
gabc_score_determination_lval.text = \
- gregorio_strdup(gabc_score_determination_text); \
+ gabc_unescape(gabc_score_determination_text); \
return CHARACTERS
#define RETURN_SPACE \
@@ -248,7 +248,7 @@ semicolon. */
<score>[\n\r][\n\r \t]* {
RETURN_SPACE;
}
-<score>[^-,;:.\{\}\(\[\]<%\n\r]+ {
+<score>(\$.|[^-,;:.\{\}\(\[\]<%\n\r])+ {
RETURN_CHARACTERS;
}
<score>- {
@@ -318,7 +318,7 @@ semicolon. */
<sp>[\n\r][\n\r \t]* {
RETURN_SPACE;
}
-<sp>[^<\{\}\n\r]+ {
+<sp>(\$.|[^<\{\}\n\r])+ {
RETURN_CHARACTERS;
}
<score>\% {
@@ -338,7 +338,7 @@ semicolon. */
BEGIN(score);
return VERB_END;
}
-<verb,alt>[^<]+ {
+<verb,alt>(\$.|[^<])+ {
RETURN_CHARACTERS;
}
<verb,score,alt>< {
@@ -397,7 +397,7 @@ semicolon. */
BEGIN(notes);
return OPENING_BRACKET;
}
-<notes>[^|\)]+ {
+<notes>(\$.|[^|\)])+ {
gabc_score_determination_lval.text =
gregorio_strdup(gabc_score_determination_text);
return NOTES;