Fix #3805: dash correctly terminates commands in layout files #4137
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
koppor
approved these changes
Jun 19, 2018
CHANGELOG.md
Outdated
| @@ -31,6 +31,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `# | |||
| - We fixed an issue where in rare cases entries where overlayed in the main table. https://github.com/JabRef/jabref/issues/3281 | |||
| - We fixed an issue where selecting a group messed up the focus of the main table / entry editor. https://github.com/JabRef/jabref/issues/3367 | |||
| - We fixed an issue where composite author names were sorted incorrectly. https://github.com/JabRef/jabref/issues/2828 | |||
| - We fixed an issue where commands followed by `-` didn't worked. [#3805](https://github.com/JabRef/jabref/issues/3805) | |||
There was a problem hiding this comment.
Please change "worked" into "work".
| @@ -33,7 +33,7 @@ public Layout(List<StringInt> parsedEntries, LayoutFormatterPreferences prefs) { | |||
| for (StringInt parsedEntry : parsedEntries) { | |||
| switch (parsedEntry.i) { | |||
| case LayoutHelper.IS_LAYOUT_TEXT: | |||
| case LayoutHelper.IS_SIMPLE_FIELD: | |||
| case LayoutHelper.IS_SIMPLE_COMMAND: | |||
There was a problem hiding this comment.
Please double check tabs vs. spaces there and the line before/after
| @@ -109,7 +109,7 @@ public LayoutEntry(StringInt si, LayoutFormatterPreferences prefs) { | |||
| case LayoutHelper.IS_LAYOUT_TEXT: | |||
| text = si.s; | |||
| break; | |||
| case LayoutHelper.IS_SIMPLE_FIELD: | |||
| case LayoutHelper.IS_SIMPLE_COMMAND: | |||
There was a problem hiding this comment.
Why the extra indent? (applies for all case statements in this file)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3805. Now commands terminated by a hyphen (like
\edition-) work correctly.Way back in 2011, Morten added the extra check for hyphens (commit 392bc7a). However, I'm not aware of any field that has a dash in it, so I'm not sure what was the reason for the change (I couldn't find an old bug report).
Also refactored a bit the layout tests.