Skip to content

New syntax for separating gabc and nabc voices #1672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
davidweichiang wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

New syntax for separating gabc and nabc voices #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/gabc/gabc-score-determination.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,13 +383,16 @@ semicolon. */
BEGIN(notes);
return OPENING_BRACKET;
}
<notes>(\$.|[^|\)])+ {
<notes>(\$.|[^|&\)])+ {
gabc_score_determination_lval.text =
gregorio_strdup(gabc_score_determination_text);
return NOTES;
}
<notes>\| {
return NABC_CUT;
return NABC_MAJOR_CUT;
}
<notes>& {
return NABC_MINOR_CUT;
}
<notes>\) {
BEGIN(score);
Expand Down
21 changes: 17 additions & 4 deletions src/gabc/gabc-score-determination.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ static char *concatenate(char *first, char *const second) {
%token ALT_BEGIN ALT_END
%token NLBA_B NLBA_E
%token EUOUAE_B EUOUAE_E
%token NABC_CUT NABC_LINES
%token NABC_MAJOR_CUT NABC_MINOR_CUT NABC_LINES
%token CLEAR
%token PROTRUSION PROTRUSION_VALUE PROTRUSION_END PROTRUDING_PUNCTUATION

Expand Down Expand Up @@ -866,17 +866,30 @@ note:
nabc_state=0;
update_position_with_space();
}
| NOTES NABC_CUT {
| NOTES NABC_MAJOR_CUT {
if (!nabc_lines) {
gregorio_message(_("You used character \"|\" in gabc without "
"setting \"nabc-lines\" parameter. Please "
gregorio_message(_("You used an nabc separator \"|\" without "
"setting the \"nabc-lines\" parameter. Please "
"set it in your gabc header."),
"det_score", VERBOSITY_FATAL, 0);
}
gabc_y_add_notes($1.text, @1);
free($1.text);
nabc_state = (nabc_state + 1) % (nabc_lines+1);
}
| NOTES NABC_MINOR_CUT {
if (!nabc_lines) {
gregorio_message(_("You used an nabc separator \"&\" without "
"setting the \"nabc-lines\" parameter. Please "
"set it in your gabc header."),
"det_score", VERBOSITY_FATAL, 0);
}
gabc_y_add_notes($1.text, @1);
free($1.text);
nabc_state = (nabc_state + 1) % (nabc_lines+1);
if (nabc_state == 0)
gregorio_message(_("Too many nabc segments"), "det_score", VERBOSITY_FATAL, 0);
}
| CLOSING_BRACKET {
elements[voice]=NULL;
nabc_state=0;
Expand Down