Skip to content

Fix and clarify messages related to selection of vowel rules #1736

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
rpspringuel wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

Fix and clarify messages related to selection of vowel rules #1736

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0dd03b9
Fix and clarify messages related to selection of vowel rules
rpspringuel Mar 26, 2026
bf40f9d
Merge branch 'develop' into vowelrules
rpspringuel Apr 19, 2026
92052e9
Split message cases
rpspringuel Apr 19, 2026
f54fac2
Merge branch 'develop' into vowelrules
rpspringuel May 5, 2026
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
29 changes: 26 additions & 3 deletions src/characters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ static bool read_vowel_rules(char *const lang) {
gregorio_kpse_find_or_else(filenames, VOWEL_FILE, return false);

gregorio_vowel_tables_init();
/* first check to see if the language is Latin */
bool is_latin = (strcasecmp(language, "latin") == 0 ||
strcasecmp(language, "la") == 0 ||
strcasecmp(language, "lat") == 0) ;
/* To allow for users to use customize their own Latin rules, we always
* look for the requested language in the vowel files */
/* only need to try twice; if it's not resolved by then, there is an alias
* loop */
for (tries = 0; tries < 2; ++tries) {
Expand Down Expand Up @@ -85,8 +91,23 @@ static bool read_vowel_rules(char *const lang) {
break;
}
}
if ((strcmp(language, "Latin") == 0 || strcmp(language, "latin") == 0 || strcmp(language, "la") == 0 || strcmp(language, "lat") == 0) && status == RFPS_NOT_FOUND) {
gregorio_messagef("read_rules", VERBOSITY_INFO, 0, "Falling back on internal Latin vowel rules");
if (status == RFPS_NOT_FOUND) {
if (is_latin) {
gregorio_messagef(
"read_rules",
VERBOSITY_INFO,
0,
"Using default Latin vowel rules"
);
} else {
gregorio_messagef(
"read_rules",
VERBOSITY_WARNING,
0,
"Selecting Latin instead of %s",
language
);
}
}
if (status == RFPS_ALIASED) {
gregorio_messagef("read_rules", VERBOSITY_WARNING, 0,
Expand All @@ -108,7 +129,9 @@ static bool read_vowel_rules(char *const lang) {
void gregorio_set_centering_language(char *const language)
{
if (!read_vowel_rules(language)) {
if (strcmp(language, "Latin") != 0 && strcmp(language, "latin") != 0 && strcmp(language, "la") != 0 && strcmp(language, "lat") != 0) {
if ((strcasecmp(language, "latin") != 0 ||
strcasecmp(language, "la") != 0 ||
strcasecmp(language, "lat") != 0) {
gregorio_messagef("gregorio_set_centering_language",
VERBOSITY_WARNING, 0, _("unable to read vowel files for "
"%s; defaulting to Latin vowel rules"), language);
Expand Down