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

fixing #1189 #1195

Merged
merged 6 commits into from
Jul 31, 2016
Merged

fixing #1189 #1195

merged 6 commits into from
Jul 31, 2016

Conversation

eroux
Copy link
Contributor

@eroux eroux commented Jul 30, 2016

This should fix #1189, currently only the TeX part is here

henryso added 2 commits July 30, 2016 13:10
Added code to emit \GreSetLargestClef at the top of the score.
@henryso
Copy link
Contributor

henryso commented Jul 30, 2016

I added the C part. Running the tests, I think the results look as they should, given the code, but the fix-1192 test shows a weird edge case, where the clef change to a larger clef occurs on the last (in this case, the only) line, adding space to the first clef which really doesn't align it with anything below. I presume something similar would occur if the clef changes from C to F to C on the same line.

@eroux
Copy link
Contributor Author

eroux commented Jul 30, 2016

Thanks a lot! Indeed the current mechanism doesn't cover the kind of edge cases you're describing, but they should be very rare and easy to fix in gabc. I'll run the tests

@henryso
Copy link
Contributor

henryso commented Jul 30, 2016

Perhaps how to fix this edge case in gabc should be documented. I'll admit I have no idea how you'd do that.

@eroux
Copy link
Contributor Author

eroux commented Jul 30, 2016

Strange: trying to run the tests, I have a lot of message like

_: ligne 18 : printf: 0.999984: nombre non valable

and all tests fail, although the diff-*.png show no visible difference... any idea where this may come from?

@henryso
Copy link
Contributor

henryso commented Jul 30, 2016

Must be the test scripts. I'll look into it... Maybe a locale issue.

@henryso
Copy link
Contributor

henryso commented Jul 30, 2016

It's definitely a locale problem. compare is returning 0.999984 and your locale most likely is expecting 0,999984. I'll have to think about the best way to fix this one.

@henryso
Copy link
Contributor

henryso commented Jul 30, 2016

I set LC_ALL=C in gregorio-test.sh. Let me know if that helps.

@eroux
Copy link
Contributor Author

eroux commented Jul 31, 2016

that solved the problem, thanks!

@eroux
Copy link
Contributor Author

eroux commented Jul 31, 2016

Ok, I think this is ready to review

\end{argtable}

\macroname{\textbackslash grelocalbolshiftcleftype}{\{\#1\}}{gregoriotex-spaces.tex}
Equivalent of \verb=\grebolshiftcleftype= but valid only until the next end of a score, and with more options. This can be used inside gabc for corner cases like different alignment on a score taking two pages.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is the user documentation, I would explicitly mention that this should be used in a <v>texverb</v> in gabc.

@henryso
Copy link
Contributor

henryso commented Jul 31, 2016

I can't review the C code since I wrote it, but I'm done reviewing the TeX code and documentation.

@eroux
Copy link
Contributor Author

eroux commented Jul 31, 2016

done, thanks

@henryso
Copy link
Contributor

henryso commented Jul 31, 2016

Looks fine to me. If you're OK with the C code, then I think this can be merged.

@eroux
Copy link
Contributor Author

eroux commented Jul 31, 2016

Thanks!

@eroux eroux merged commit b7016b7 into develop Jul 31, 2016
@henryso henryso deleted the fix-1189 branch July 31, 2016 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants