colors: don't handle gray separately

Author: nschloe

src/tikzplotlib/_color.py

@@ -66,20 +66,22 @@ def mpl_color2xcolor(data, matplotlib_color):
         if all(my_col[:3] == rgb):
             return data, name, my_col
 
-    if np.all(my_col[0] == my_col[:3]):
-        # gray
-        # my_col[0] = 0.70123112 -> gray070
-        name = f"gray{int(100 * my_col[0]):03d}"
-        if name not in data["custom colors"]:
-            data["custom colors"][name] = ("gray", str(my_col[0]))
-        return data, name, my_col
+    # Don't handle gray colors separately. They can be specified in xcolor as
+    #
+    #  {gray}{0.6901960784313725}
+    #
+    # but this float representation hides the fact that this is actually an
+    # RGB255 integer value, 176.
 
     # convert to RGB255
     rgb255 = np.array(my_col[:3] * 255, dtype=int)
 
     name, diff = _get_closest_colour_name(rgb255)
     if diff > 0:
-        name = f"{name}{rgb255[0]}{rgb255[1]}{rgb255[2]}"
+        if np.all(my_col[0] == my_col[:3]):
+            name = f"{name}{rgb255[0]}"
+        else:
+            name = f"{name}{rgb255[0]}{rgb255[1]}{rgb255[2]}"
     data["custom colors"][name] = ("RGB", ",".join([str(val) for val in rgb255]))
 
     return data, name, my_col

tests/test_legends_reference.tex

@@ -1,16 +1,20 @@
 \begin{tikzpicture}
 
+\definecolor{gray069}{gray}{0.6901960784313725}
+\definecolor{gray080}{gray}{0.8}
+\definecolor{green01270}{RGB}{0,127,0}
+
 \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,
 title={Masked line demo},
 unbounded coords=jump,
-x grid style={white!69.019608!black},
+x grid style={gray069},
 xmin=-0.3, xmax=6.3,
 xtick style={color=black},
-y grid style={white!69.019608!black},
+y grid style={gray069},
 ymin=-1.0959515, ymax=1.0993605,
 ytick style={color=black}
 ]
@@ -34,7 +38,7 @@
 6 -0.2794155
 };
 \addlegendentry{No mask}
-\addplot [thick, green!50!black]
+\addplot [thick, green01270]
 table {%
 0 0
 0.4 nan

tests/test_patches_reference.tex

@@ -1,20 +1,21 @@
 \begin{tikzpicture}
 
-\definecolor{color0}{rgb}{0.241237,0.296485,0.539709}
-\definecolor{color1}{rgb}{0.187231,0.414746,0.556547}
-\definecolor{color2}{rgb}{0.636902,0.856542,0.21662}
-\definecolor{color3}{rgb}{0.273006,0.20452,0.501721}
-\definecolor{color4}{rgb}{0.15627,0.489624,0.557936}
-\definecolor{color5}{rgb}{0.993248,0.906157,0.143936}
-\definecolor{color6}{rgb}{0.140536,0.530132,0.555659}
-\definecolor{color7}{rgb}{0.12138,0.629492,0.531973}
-\definecolor{color8}{rgb}{0.267004,0.004874,0.329415}
-\definecolor{color9}{rgb}{0.515992,0.831158,0.294279}
-\definecolor{color10}{rgb}{0.119699,0.61849,0.536347}
-\definecolor{color11}{rgb}{0.131172,0.555899,0.552459}
-\definecolor{color12}{rgb}{0.227802,0.326594,0.546532}
-\definecolor{color13}{rgb}{0.248629,0.278775,0.534556}
-\definecolor{color14}{rgb}{0.12156863,0.46666667,0.70588235}
+\definecolor{darkcyan30157136}{RGB}{30,157,136}
+\definecolor{darkcyan30160135}{RGB}{30,160,135}
+\definecolor{darkcyan33141140}{RGB}{33,141,140}
+\definecolor{darkcyan35135141}{RGB}{35,135,141}
+\definecolor{darkslateblue47105141}{RGB}{47,105,141}
+\definecolor{darkslateblue5883139}{RGB}{58,83,139}
+\definecolor{darkslateblue6175137}{RGB}{61,75,137}
+\definecolor{darkslateblue6371136}{RGB}{63,71,136}
+\definecolor{darkslateblue6952127}{RGB}{69,52,127}
+\definecolor{gold25323136}{RGB}{253,231,36}
+\definecolor{gray069}{gray}{0.6901960784313725}
+\definecolor{indigo68184}{RGB}{68,1,84}
+\definecolor{steelblue31119180}{RGB}{31,119,180}
+\definecolor{teal39124142}{RGB}{39,124,142}
+\definecolor{yellowgreen13121175}{RGB}{131,211,75}
+\definecolor{yellowgreen16221855}{RGB}{162,218,55}
 
 \begin{axis}[
 colorbar,
@@ -24,14 +25,14 @@
 point meta min=12.062867,
 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}
 ]
-\path [fill=color0, fill opacity=0.4]
+\path [fill=darkslateblue6175137, fill opacity=0.4]
 (axis cs:0.69646919,0.45323835)
 .. controls (axis cs:0.72247936,0.45323835) and (axis cs:0.74742772,0.4635723) .. (axis cs:0.76581969,0.48196427)
 .. controls (axis cs:0.78421166,0.50035624) and (axis cs:0.79454561,0.5253046) .. (axis cs:0.79454561,0.55131477)

tests/test_text_overlay_reference.tex

@@ -1,7 +1,7 @@
 \begin{tikzpicture}
 
-\definecolor{gray069}{gray}{0.6901960784313725}
-\definecolor{gray080}{gray}{0.8}
+\definecolor{darkgray176}{RGB}{176,176,176}
+\definecolor{lightgray204}{RGB}{204,204,204}
 \definecolor{pink255204204}{RGB}{255,204,204}
 \definecolor{salmon255127127}{RGB}{255,127,127}
 \definecolor{steelblue31119180}{RGB}{31,119,180}
@@ -14,14 +14,14 @@
   text opacity=1,
   at={(0.03,0.97)},
   anchor=north west,
-  draw=gray080
+  draw=lightgray204
 },
 tick align=outside,
 tick pos=left,
-x grid style={gray069},
+x grid style={darkgray176},
 xmin=-0.25, xmax=5.25,
 xtick style={color=black},
-y grid style={gray069},
+y grid style={darkgray176},
 ymin=-1.25, ymax=26.25,
 ytick style={color=black}
 ]