Skip to content

Commit

Permalink
fix #1152
Browse files Browse the repository at this point in the history
  • Loading branch information
eroux committed Jun 23, 2016
1 parent be4e1c8 commit 6f4efb9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- A two-line initial on a two-line score no longer generates an error (see [#1139](https://github.com/gregorio-project/gregorio/issues/1139)).
- Staff lines after a two-line initial should now be sized correctly in a more consistent way (see [#1141](https://github.com/gregorio-project/gregorio/issues/1141)).

- In rare cases, the very last bar or glyph of a score could appear alone at the beginning of the final line (see [#1152](https://github.com/gregorio-project/gregorio/issues/1152)).

## [4.2.0-rc1] - 2016-05-31
### Fixed
Expand Down
7 changes: 6 additions & 1 deletion src/gregoriotex/gregoriotex-write.c
Original file line number Diff line number Diff line change
Expand Up @@ -2354,7 +2354,7 @@ static const char *next_custos(const signed char next_note_pitch,
{
static char buf[30];

gregorio_snprintf(buf, sizeof buf, "\\GreNextCustos{%d}{%s}",
gregorio_snprintf(buf, sizeof buf, "\\GreNextCustos{%d}{%s}",
pitch_value(next_note_pitch),
alteration_name(next_note_alteration));

Expand Down Expand Up @@ -3835,6 +3835,7 @@ static void write_syllable(FILE *f, gregorio_syllable *syllable,
break;

case GRE_BAR:
handle_last_of_voice(f, element, *last_of_voice);
write_bar(f, element->u.misc.unpitched.info.bar,
element->u.misc.unpitched.special_sign,
element->next && !is_manual_custos(element->next)
Expand Down Expand Up @@ -3973,6 +3974,10 @@ static void initialize_score(gregoriotex_status *const status,
}
break;

case GRE_BAR:
last_of_voice[voice] = element;
break;

default:
/* to eliminate the warning */
break;
Expand Down

0 comments on commit 6f4efb9

Please sign in to comment.