sort colors by key

Author: nschloe

setup.cfg

@@ -41,6 +41,7 @@ install_requires =
     matplotlib >= 1.4.0
     numpy
     Pillow
+    webcolors
 python_requires = >=3.7
 
 [options.packages.find]

src/tikzplotlib/_save.py

@@ -271,10 +271,12 @@ def _tex_comment(comment):
 
 def _get_color_definitions(data):
     """Returns the list of custom color definitions for the TikZ file."""
-    ff = data["float format"]
+    # sort by key
+    sorted_keys = sorted(data["custom colors"].keys(), key=lambda x: x.lower())
+    d = {key: data["custom colors"][key] for key in sorted_keys}
     return [
-        f"\\definecolor{{{name}}}{{rgb}}{{{rgb[0]:{ff}},{rgb[1]:{ff}},{rgb[2]:{ff}}}}"
-        for name, rgb in data["custom colors"].items()
+        f"\\definecolor{{{name}}}{{{space}}}{{{val}}}"
+        for name, (space, val) in d.items()
     ]
 
 

tests/test_barchart_legend_reference.tex

@@ -1,14 +1,18 @@
 \begin{tikzpicture}
 
+\definecolor{gray069}{gray}{0.6901960784313725}
+\definecolor{green01270}{RGB}{0,127,0}
+\definecolor{gray080}{gray}{0.8}
+
 \begin{axis}[
 legend cell align={left},
-legend style={fill opacity=0.8, draw opacity=1, text opacity=1, draw=white!80!black},
+legend style={fill opacity=0.8, draw opacity=1, text opacity=1, draw=gray080},
 tick align=outside,
 tick pos=left,
-x grid style={white!69.019608!black},
+x grid style={gray069},
 xmin=-0.5125, xmax=2.5125,
 xtick style={color=black},
-y grid style={white!69.019608!black},
+y grid style={gray069},
 ymin=0, ymax=5.25,
 ytick style={color=black}
 ]
@@ -18,12 +22,12 @@
 
 \draw[draw=none,fill=blue] (axis cs:0.625,0) rectangle (axis cs:0.875,2);
 \draw[draw=none,fill=blue] (axis cs:1.625,0) rectangle (axis cs:1.875,3);
-\draw[draw=none,fill=green!50!black] (axis cs:-0.125,0) rectangle (axis cs:0.125,3);
+\draw[draw=none,fill=green01270] (axis cs:-0.125,0) rectangle (axis cs:0.125,3);
 \addlegendimage{ybar,ybar legend,draw=none,fill=green!50!black}
 \addlegendentry{Data 2}
 
-\draw[draw=none,fill=green!50!black] (axis cs:0.875,0) rectangle (axis cs:1.125,2);
-\draw[draw=none,fill=green!50!black] (axis cs:1.875,0) rectangle (axis cs:2.125,4);
+\draw[draw=none,fill=green01270] (axis cs:0.875,0) rectangle (axis cs:1.125,2);
+\draw[draw=none,fill=green01270] (axis cs:1.875,0) rectangle (axis cs:2.125,4);
 \draw[draw=none,fill=red] (axis cs:0.125,0) rectangle (axis cs:0.375,5);
 \addlegendimage{ybar,ybar legend,draw=none,fill=red}
 \addlegendentry{Data 3}

tests/test_cleanfigure.py

@@ -602,7 +602,7 @@ def test_xlog_2(self):
             num_lines_raw = raw.count("\n")
             num_lines_clean = clean.count("\n")
             assert num_lines_raw - num_lines_clean == 51
-            assert num_lines_clean == 71
+            assert num_lines_clean == 72
         plt.close("all")
 
     def test_loglog_2(self):

tests/test_context_reference.tex

@@ -1,12 +1,14 @@
 \starttikzpicture
 
+\definecolor{gray069}{gray}{0.6901960784313725}
+
 \startaxis[
 tick align=outside,
 tick pos=left,
-x grid style={white!69.019608!black},
+x grid style={gray069},
 xmin=0, xmax=1,
 xtick style={color=black},
-y grid style={white!69.019608!black},
+y grid style={gray069},
 ymin=0, ymax=1,
 ytick style={color=black}
 ]

tests/test_fancy_colorbar_reference.tex

@@ -1,5 +1,7 @@
 \begin{tikzpicture}
 
+\definecolor{gray069}{gray}{0.6901960784313725}
+
 \begin{axis}[
 colorbar,
 colorbar style={ylabel={}},
@@ -8,11 +10,11 @@
 point meta min=0,
 tick align=outside,
 tick pos=left,
-x grid style={white!69.019608!black},
+x grid style={gray069},
 xmin=-0.5, xmax=2.5,
 xtick style={color=black},
 y dir=reverse,
-y grid style={white!69.019608!black},
+y grid style={gray069},
 ymin=-0.5, ymax=2.5,
 ytick style={color=black}
 ]

tests/test_heat_reference.tex

@@ -1,5 +1,7 @@
 \begin{tikzpicture}
 
+\definecolor{gray069}{gray}{0.6901960784313725}
+
 \begin{axis}[
 colorbar,
 colorbar style={ylabel={}},
@@ -8,10 +10,10 @@
 point meta min=-100,
 tick align=outside,
 tick pos=left,
-x grid style={white!69.019608!black},
+x grid style={gray069},
 xmin=-10, xmax=10,
 xtick style={color=black},
-y grid style={white!69.019608!black},
+y grid style={gray069},
 ymin=-10, ymax=10,
 ytick style={color=black}
 ]

tests/test_text_overlay_reference.tex

@@ -1,8 +1,10 @@
 \begin{tikzpicture}
 
-\definecolor{color0}{rgb}{0.12156863,0.46666667,0.70588235}
-\definecolor{color1}{rgb}{1,0.8,0.8}
-\definecolor{color2}{rgb}{1,0.5,0.5}
+\definecolor{gray069}{gray}{0.6901960784313725}
+\definecolor{gray080}{gray}{0.8}
+\definecolor{pink255204204}{RGB}{255,204,204}
+\definecolor{salmon255127127}{RGB}{255,127,127}
+\definecolor{steelblue31119180}{RGB}{31,119,180}
 
 \begin{axis}[
 legend cell align={left},
@@ -12,18 +14,18 @@
   text opacity=1,
   at={(0.03,0.97)},
   anchor=north west,
-  draw=white!80!black
+  draw=gray080
 },
 tick align=outside,
 tick pos=left,
-x grid style={white!69.019608!black},
+x grid style={gray069},
 xmin=-0.25, xmax=5.25,
 xtick style={color=black},
-y grid style={white!69.019608!black},
+y grid style={gray069},
 ymin=-1.25, ymax=26.25,
 ytick style={color=black}
 ]
-\addplot [semithick, color0]
+\addplot [semithick, steelblue31119180]
 table {%
 0 0
 0.10204082 0.010412328
@@ -79,8 +81,8 @@
 \addlegendentry{a graph}
 \draw (axis cs:1,5) node[
   scale=2.5,
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=2pt,
   rounded corners,
@@ -91,16 +93,16 @@
 ]{\itshape test1};
 \draw (axis cs:3,6) node[
   scale=2.5,
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   text=blue,
   rotate=330.0
 ]{\bfseries test2};
 \draw (axis cs:4,8) node[
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   single arrow,
@@ -109,8 +111,8 @@
   rotate=90.0
 ]{\bfseries test3};
 \draw (axis cs:4,16) node[
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   single arrow,
@@ -120,26 +122,26 @@
   rotate=90.0
 ]{\bfseries test4};
 \draw (axis cs:2,18) node[
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   double arrow,
   text=blue,
   rotate=0.0
 ]{test5};
 \draw (axis cs:1,20) node[
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   circle,
   text=blue,
   rotate=0.0
 ]{test6};
 \draw (axis cs:3,23) node[
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   decorate,
@@ -148,8 +150,8 @@
   rotate=0.0
 ]{test7};
 \draw (axis cs:3,20) node[
-  fill=color1,
-  draw=color2,
+  fill=pink255204204,
+  draw=salmon255127127,
   line width=0.4pt,
   inner sep=3pt,
   decorate,