Merge v2.x into master #6246
Merged
Merge v2.x into master #6246
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
- removed darksage, lightsage, sage which are colors we added in 1ac590e These colors are now included in the XKCD mapping - correct sandybrown which mpl had as '#FAA460' but should be '#F4A460' according to the w3 group, wikipedia, the copy of rgb.txt bundled in the emacs source, and the mapping that we had bundled with AGG for a while. The original value goes back to ec45d17
- convert the single-letter colors to hex in source - single path for looking up string -> hex -> rgb values
- prefer the CSS4 str -> hex values because they are the 'standard'. The xkcd colors might be 'better', but we are not the right place to lead that change. If users use CSS/HTML/X11 color in mpl they should expect it to match the same color set in html for embedding mpl figures into websites and such. - Provide entries in XKCD dict of all names (with and with out spaces) prefixed with XKCD. Thus to get XKCD's version of blue use `color='xkcdblue'
The hex representations are not exact which resulted in very small slight color changes.
ColorConverter lowercases everything on the way in.
Fix about dialog on Qt 5
Update LICENSE file to match doc/users/license.rst
Documentation bug fix: matplotlib#5517
Documentation bug matplotlib#6180
Use io.BytesIO instead of io.StringIO in examples
ENH: add XKCD colorname -> hex mapping
Use Agg for rendering in the Mac OSX backend
Fix sphinx 1.4.0 issues
Conflicts:
.travis.yml
Reject all changes
Doc update donation
merge V1.5.1 doc into 1.5.x
merge V1.5.x into 2.x
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.
Doing via a PR to make sure I get the conflicts handled correctly