10000 Merge v2.x into master by jenshnielsen · Pull Request #6246 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Merge v2.x into master #6246

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

Merged
merged 28 commits into from
Mar 30, 2016
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
605a8af
ENH: add XKCD colorname -> hex mapping
tacaswell Dec 31, 2015
010be02
MNT: normalize X11/CSS/HTML colors
tacaswell Jan 2, 2016
e392d03
MNT: normalize to use un-spaced names in XKCD map
tacaswell Jan 2, 2016
e049a49
MNT: unify string handling
tacaswell Jan 2, 2016
bda202b
MNT: always validate alpha as [0, 1] or None
tacaswell Jan 2, 2016
b2543f6
MNT: add xkcd prefix + switch priority order
tacaswell Jan 5, 2016
9feeb9e
FIX: restore single character colors to rgb tuples
tacaswell Jan 18, 2016
3d4a517
DOC: remove last paypal link
tacaswell Feb 8, 2016
b93bd5d
WIP color docs
tacaswell Feb 14, 2016
db5ef16
Update LICENSE file to match doc/users/license.rst
mdboom Mar 2, 2016
80a8e53
DOC: remove static images
tacaswell Feb 8, 2016
f3d4415
DOC/MNT: remove unused/outdate files
tacaswell Mar 7, 8000 2016
9963cca
FIX: use lowercase in map
tacaswell Mar 7, 2016
fafa36f
DOC: string -> color mappings
tacaswell Mar 7, 2016
20db6a0
Merge pull request #6124 from estan/qt5-example-fixes
tacaswell Mar 7, 2016
7c4eb6b
Fixed year issues
mdboom Mar 7, 2016
1bd80a2
Merge pull request #6098 from mdboom/license-update
tacaswell Mar 7, 2016
d74eca5
Merge pull request #6194 from story645/patch-1
tacaswell Mar 21, 2016
e277f99
Merge pull request #6195 from story645/patch-2
tacaswell Mar 21, 2016
40cfef1
Merge pull request #6205 from mdboom/fix-stringio
tacaswell Mar 26, 2016
9687f65
TST: add smoke test for the color blue
tacaswell Mar 28, 2016
9655f45
Merge pull request #5775 from tacaswell/enh_xkcd_colors
jenshnielsen Mar 29, 2016
e981e1e
Merge pull request #6178 from mdboom/macagg
efiring Mar 28, 2016
3a944a6
Merge pull request #6238 from jenshnielsen/fixsphinx140issues
tacaswell Mar 30, 2016
bf82d92
Merge pull request #5973 from tacaswell/doc_update_donation
jenshnielsen Mar 30, 2016
860fdfe
Merge pull request #6244 from matplotlib/v1.5.1-doc
jenshnielsen Mar 30, 2016
9e1668b
Merge pull request #6245 from matplotlib/v1.5.x
jenshnielsen Mar 30, 2016
6461814
Merge remote-tracking branch 'matplotlib/v2.x' into mergev2.xmaster
jenshnielsen Mar 30, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP color docs
  • Loading branch information
tacaswell committed Feb 14, 2016
commit b93bd5db6435c95f8428da5efa53200563d63771
4 changes: 1 addition & 3 deletions doc/users/beginner.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ Beginner's Guide
legend_guide.rst
annotations_guide.rst
screenshots.rst
colors.rst
colormaps.rst
colormapnorms.rst



21 changes: 21 additions & 0 deletions doc/users/colors.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.. _colors:

*****************
Specifying Colors
*****************

In almost all places in matplotlib where a color can be specified by the user it can be provided as:

* ``(r, g, b)`` tuples
* ``(r, g, b, a)`` tuples
* hex string, ex ``#OFOFOF``
* float value between [0, 1] for gray level
* valid css4/X11 name
* valid name from the `XKCD color survey <http://blog.xkcd.com/2010/05/03/color-survey-results/>`__ This names maybe
prefixed by ``'XKCD'`` as the css4 names have priority
* One of ``{'b', 'g', 'r', 'c', 'm', 'y', 'k', 'w'}``

Internally, we are moving to storing all colors as RGBA quadruples.

Name clash between CSS4/X11 and XKCD
------------------------------------
0