Don't insert spurious newlines by joining tex.preamble. #12805
Merged
Conversation
This file contains hidden or 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
The rc validator already makes it a single string. Also reject non-strings in the validator, as there isn't much use to them anyways in this context.
|
Thanks! I forgot about that... |
timhoffm
reviewed
Nov 14, 2018
| elif isinstance(s, Iterable): | ||
| return '\n'.join(s) | ||
| else: | ||
| raise TypeError |
There was a problem hiding this comment.
The try-except seem unnecessary. Afaics, this can only come from the explicit raise and thus can be simplified.
There was a problem hiding this comment.
No, it can also happen if s is not an iterable of strings.
timhoffm
approved these changes
Nov 15, 2018
|
There are no reasonable tests for this? |
|
I'm sure some could be added, but note that text.latex.preamble is "officially not supported". |
jklymak
approved these changes
Nov 19, 2018
bcbnz
added a commit
to bcbnz/matplotlib-pgfutils
that referenced
this pull request
Mar 23, 2019
The current matplotlib.rcParams validator for the preamble splits the
string on commas. The resulting list is subsequently re-joined with
newlines, causing TeX to fail when the preamble contained commas (e.g.,
key-value configuration of a package). Two pull requests switching to a
proper TeX validator have been accepted and should be included when
matplotlib 3.1.0 is released:
* matplotlib/matplotlib#12674
* matplotlib/matplotlib#12805
In the meantime, we can work around this by replacing the validator with
a call to str.splitlines(). The workaround is implemented in a
future-proof manner as it is only installed if the TeX validator could
not be imported, i.e., as soon as it is used with a version of
matplotlib containing the validator the workaround should be ignored.
This also adds a couple of unit tests which use the preamble to set
custom fonts. The font used is Cotham Sans, released under the SIL Open
Font License 1.1.
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.
The rc validator already makes it a single string.
Also reject non-strings in the validator, as there isn't much use to
them anyways in this context.
Closes #12804, I think.
PR Summary
PR Checklist