Skip to content

Commit

Permalink
Merge pull request #1513 from rpspringuel/latin-message
Browse files Browse the repository at this point in the history
Modify vowel message
  • Loading branch information
rpspringuel authored Feb 7, 2021
2 parents 78448a2 + 399fad9 commit e977ca7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).

### Added
- Default spacings are now designated internal and thus always loaded. `gsp-sample.tex` is added to the `doc` folder to show users how to create their own custom spacing configuration. As part of this change, spacing configuration files no longer need to be complete. Since the default configuration is always loaded at package startup, all needed penalties and spacings will be defined and the user's configuration file need only specify those whose value they wish to customize. Addresses issues raised in [#1460](https://github.com/gregorio-project/gregorio/issues/1460). **This is a change to the user interface and warrants a major release.**
- Added additional message to verbose output of command-line tool to prevent confusion when a custom Latin vowel convention is found that the internal Latin rules will be used. See [#1470](https://github.com/gregorio-project/gregorio/issues/1470).

## [Unreleased][CTAN]
### Fixed
Expand Down
5 changes: 4 additions & 1 deletion src/characters.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ 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_ALIASED) {
gregorio_messagef("read_rules", VERBOSITY_WARNING, 0,
_("Unable to resolve alias for %s"), lang);
Expand All @@ -108,7 +111,7 @@ void gregorio_set_centering_language(char *const language)
if (strcmp(language, "Latin") != 0 && strcmp(language, "latin") != 0 && strcmp(language, "la") != 0 && strcmp(language, "lat") != 0) {
gregorio_messagef("gregorio_set_centering_language",
VERBOSITY_WARNING, 0, _("unable to read vowel files for "
"%s; defaulting to Latin rules"), language);
"%s; defaulting to Latin vowel rules"), language);
}

gregorio_vowel_tables_init();
Expand Down

0 comments on commit e977ca7

Please sign in to comment.