Charts: Use colours from Tango palette instead of fully saturated primaries

diff --git a/NEWS b/NEWS
index a836d8938a4c6da2e772615ff085f9e96a166de5..7da909cd20022fca00de6c7be6f14432bceb18e7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,11 @@ Copyright (C) 1996-2000, 2008-2013 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
+ 
+Changes since 0.8.1:
+
+ * Charts are now rendered with colours from the Tango palette instead of fully 
+   saturated primaries.
 
 Changes from 0.8.0 to 0.8.1:
 

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index dd0cd0563b42e5854cbc1908426681528f60770a..42d1248146c2100a290f414dee04d1a0f6f9fd02 100644 (file)
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -60,9 +60,7 @@ xrchart_geometry_init (cairo_t *cr, struct xrchart_geometry *geom,
   geom->dataset = NULL;
   geom->n_datasets = 0;
 
-  geom->fill_colour.red = 255;
-  geom->fill_colour.green = 0;
-  geom->fill_colour.blue = 0;
+  geom->fill_colour = data_colour[0];
 
   cairo_set_line_width (cr, 1.0);
 
@@ -100,19 +98,42 @@ pango_layout_get_baseline (PangoLayout    *layout)
 }
 #endif
 
-
-
+/*  
+    These colours come from: 
+    http://tango.freedesktop.org/static/cvs/tango-art-tools/palettes/Tango-Palette.gpl */
 const struct xrchart_colour data_colour[XRCHART_N_COLOURS] =
   {
-    { 165, 42, 42 },            /* brown */
-    { 255, 0, 0 },              /* red */
-    { 255, 165, 0 },            /* orange */
-    { 255, 255, 0 },            /* yellow */
-    { 0, 255, 0 },              /* green */
-    { 0, 0, 255 },              /* blue */
-    { 238, 130, 238 },          /* violet */
-    { 190, 190, 190 },          /* grey */
-    { 255, 192, 203 },          /* pink */
+    {252, 233,  79},   /* Butter 1 */
+    {138, 226,  52},   /* Chameleon 1 */
+    {252, 175,  62},   /* Orange 1 */
+    {114, 159, 207},   /* Sky Blue 1 */
+    {173, 127, 168},   /* Plum 1 */
+    {233, 185, 110},   /* Chocolate 1 */
+    {239,  41,  41},   /* Scarlet Red 1 */
+    {238, 238, 236},   /* Aluminium 1 */
+
+    {237, 212,   0},   /* Butter 2 */
+    {115, 210,  22},   /* Chameleon 2 */
+    {245, 121,   0},   /* Orange 2 */
+    {52,  101, 164},   /* Sky Blue 2 */
+    {117,  80, 123},   /* Plum 2 */
+    {193, 125,  17},   /* Chocolate 2 */
+    {204,   0,   0},   /* Scarlet Red 2 */
+
+    {136, 138, 133},   /* Aluminium 4 */
+
+    {196, 160,   0},   /* Butter 3 */
+    {78,  154,   6},   /* Chameleon 3 */
+    {206,  92,   0},   /* Orange 3 */
+    {32,   74, 135},   /* Sky Blue 3 */
+    {92,   53, 102},   /* Plum 3 */
+    {143,  89,   2},   /* Chocolate 3 */
+    {164,   0,   0},   /* Scarlet Red 3 */
+    {85,   87,  83},   /* Aluminium 5 */
+
+    {211, 215, 207},   /* Aluminium 2 */
+    {186, 189, 182},   /* Aluminium 3 */
+    {46,   52,  54},   /* Aluminium 6 */
   };
 
 void

diff --git a/src/output/cairo-chart.h b/src/output/cairo-chart.h
index 0864d7e0142e00b45c95b2cec86c5d9b74ddd95b..646b1cc3d7e97eaa49d86338a1d6eb2b7b63e2e8 100644 (file)
--- a/src/output/cairo-chart.h
+++ b/src/output/cairo-chart.h
@@ -74,7 +74,7 @@ void xrchart_geometry_init (cairo_t *, struct xrchart_geometry *,
                             double width, double length);
 void xrchart_geometry_free (cairo_t *, struct xrchart_geometry *);
 
-#define XRCHART_N_COLOURS 9
+#define XRCHART_N_COLOURS 27
 extern const struct xrchart_colour data_colour[];
 
 enum tick_orientation