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

Feature/fix 1285 #1335

Merged
merged 18 commits into from
Mar 21, 2017
Merged

Feature/fix 1285 #1335

merged 18 commits into from
Mar 21, 2017

Conversation

rpspringuel
Copy link
Contributor

Addresses #1285

I've also included the various code clean-ups that I discovered while working on this.

rpspringuel and others added 17 commits March 3, 2017 19:48
Debug messages weren’t being printed during file loading, so these messages weren’t actually doing anything.  Since the log already provides information on which files are being loaded, I’m simply deleting these messages (the other option would be to use `\AtBeginDocument` or the like).
The macro declaring the file version for gregoriotex-main.tex was some 160 lines in, which made it hard to spot.  I’ve moved it to closer to the top of the file.
…fix-1285

* commit '6a2c985c40d25bcbe31c4cb0f7c8a2f60885bd84':
  Documented debug categories.  Various documentation fixes.
  Switched Lua debug messages to use debugmessage. Fixes #1326.
Since `\hskip` is not discretionary friendly, we normally use `\gre@hskip`, which we can redefine when inside a discretionary.  However, in examining the this issue (#1285) I found a few places where a normal `\hskip` was still being used.  This commit converts all of them to `\gre@hskip`.
Implemented function to set adjust line height for next line.
…fix-1285

* commit '182b6b92d09f381591eec71ee677b69219fcf93c':
  Implemented function to set adjust line height for next line. Part of the implementation for #1285.
* fix-1285-v2:
  Fixed infinite recursion.
Set up the left box using next line heights in \GreDiscretionary.
…fix-1285

* commit 'bd659443c79417477eb094f4440b2dc5518e9bae':
  Set up the left box using next line heights in \GreDiscretionary. Fixes #1285.
@henryso
Copy link
Contributor

henryso commented Mar 19, 2017

I think this needs

  • a CHANGELOG.md entry
  • entries for \gre@save@additionalspaces and \gre@restore@additionalspaces in Command_Index_internal.tex

I’ve also simplified the documentation a bit by making the naming of registers for saved values of distances more consistent.  We might want to do something similar for counts in the future.
@rpspringuel
Copy link
Contributor Author

Done.

@henryso
Copy link
Contributor

henryso commented Mar 20, 2017

Assuming everything is tested and working after those renames, I think this looks fine.

@rpspringuel
Copy link
Contributor Author

I just double checked the tests and we're clear.

@rpspringuel rpspringuel merged commit 95f224e into develop Mar 21, 2017
@rpspringuel rpspringuel deleted the feature/fix-1285 branch March 22, 2017 00:45
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