Skip to content
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.

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

Considered automatic custos when setting the next custos. #571

Merged
merged 2 commits into from
Aug 21, 2015

Conversation

henryso
Copy link
Contributor

@henryso henryso commented Aug 20, 2015

Considered automatic custos when setting the next custos.
Recomputed the next custos if the clef change discretionary is printed.
Fixed the manual custos by reusing the automatic custos code.
Fixes #569.

This is ready for review and merge if acceptable.

Several dump/gtex tests (which use the explicit custos features in various ways) fail, but the new results are appropriate. Because the manual custos is now rendered at the element (rather than glyph) level, there is additional space before it, but this is consistent with automatic custos. This causes the divisio_finalis output test to fail in an acceptable manner. All other tests pass. Once this is merged, I will add a test for these fixes themselves.

Recomputed the next custos if the clef change discretionary is printed.
Fixes gregorio-project#569.
@henryso henryso added this to the 4.0 milestone Aug 20, 2015
@henryso
Copy link
Contributor Author

henryso commented Aug 20, 2015

A message on the mailing list reminds me that there are some other cases I need to test. I'll work on them tomorrow.

@henryso
Copy link
Contributor Author

henryso commented Aug 20, 2015

This is now ready for review and merge. I've updated the description to reflect the changes.

@eroux
Copy link
Contributor

eroux commented Aug 21, 2015

Ok !

eroux added a commit that referenced this pull request Aug 21, 2015
Considered automatic custos when setting the next custos.
@eroux eroux merged commit dfad299 into gregorio-project:develop Aug 21, 2015
henryso added a commit to gregorio-project/gregorio-test that referenced this pull request Aug 21, 2015
@henryso henryso deleted the fix-569 branch August 21, 2015 12:24
rpspringuel added a commit to rpspringuel/gregorio-test that referenced this pull request Aug 21, 2015
…ingiii

* commit 'b6a5c6ecee299318974a4f19c7ac6503068a10bd':
  Updated tests and expectations for gregorio-project/gregorio#571.
  Corrected the result file location for PDF-based tests when not verifying.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants