Add TextColor functions

Author: etfrogers

gnuplot/examples/color.rs

@@ -53,7 +53,7 @@ fn example(c: Common)
 			x.clone(),
 			iter::repeat((n_colors - 1) - i),
 			iter::repeat(0.4),
-			iter::repeat(0.2), //x.clone().map(|x| (((3 + x) as f64) / 3.0).rem(0.8)),
+			iter::repeat(0.2),
 			&[
 				Caption(&color_name(&color)),
 				LineWidth(1.0),
@@ -84,6 +84,12 @@ fn example(c: Common)
 		],
 	);
 
+	// any of the forms used for Color can also be used with TextColor and BorderColor
+	ax.set_x_label(
+		"Labels can be colored using the TextColor function",
+		&[TextColor((128, 0, 255))],
+	);
+
 	c.show(&mut fg, "rgb_color");
 }
 

gnuplot/examples/multiple_axes.rs

@@ -20,10 +20,10 @@ fn example(c: Common)
 			[-5.0f32, 0.0, 5.0].iter(),
 			&[Axes(X1, Y2), Color("red")],
 		)
-		.set_y_ticks(Some((Auto, 0)), &[Mirror(false)], &[])  // Make Y1 not mirror.
-		.set_y2_ticks(Some((Auto, 0)), &[Mirror(false)], &[])  // Make Y2 not mirror, and visible.
-		.set_y_label("Blue", &[])
-		.set_y2_label("Red", &[])
+		.set_y_ticks(Some((Auto, 0)), &[Mirror(false)], &[TextColor("blue")]) // Make Y1 not mirror.
+		.set_y2_ticks(Some((Auto, 0)), &[Mirror(false)], &[TextColor("red")]) // Make Y2 not mirror, and visible.
+		.set_y_label("Blue", &[TextColor("blue")])
+		.set_y2_label("Red", &[TextColor("red")])
 		.label("Blue Label", Axis(1.), Axis(0.), &[TextColor("blue"), TextAlign(AlignRight)])
 		.label("Red Label", Axis(2.0), Axis2(2.5), &[TextColor("red")]);
 

gnuplot/src/axes2d.rs

@@ -102,11 +102,9 @@ impl LegendData
 			}
 		}
 		first_opt! {self.text_options,
-			TextColor(ref s) =>
+			TextColorOpt(ref s) =>
 			{
-				w.write_str(" textcolor rgb \"");
-				w.write_str(&escape(s));
-				w.write_str("\"");
+				write!(w, " textcolor {} ", s.command());
 			}
 		}
 		first_opt! {self.text_options,

gnuplot/src/axes_common.rs

@@ -455,9 +455,9 @@ pub fn write_out_label_options(
 	}
 
 	first_opt! {options,
-		TextColor(ref s) =>
+		TextColorOpt(ref s) =>
 		{
-			write!(w, r#" tc rgb "{}""#, s);
+			write!(w, r#" tc {}"#, s.command());
 		}
 	}
 

gnuplot/src/options.rs

@@ -240,7 +240,7 @@ pub enum LabelOption<T>
 	Font(T, f64),
 	/// Sets the color of the label text. The passed string can be a color name
 	/// (e.g. "black" works), or an HTML color specifier (e.g. "#FFFFFF" is white)
-	TextColor(T),
+	TextColorOpt(ColorType<T>),
 	/// Rotates the label by a certain number of degrees
 	Rotate(f64),
 	/// Sets the horizontal alignment of the label text (default is left alignment). See AlignType.
@@ -278,7 +278,7 @@ impl<'l> OneWayOwned for LabelOption<&'l str>
 		{
 			TextOffset(v1, v2) => TextOffset(v1, v2),
 			Font(v1, v2) => Font(v1.into(), v2),
-			TextColor(v) => TextColor(v.into()),
+			TextColorOpt(v) => TextColorOpt(v.to_one_way_owned()),
 			Rotate(v) => Rotate(v),
 			TextAlign(v) => TextAlign(v),
 			MarkerSymbol(v) => MarkerSymbol(v),
@@ -288,6 +288,13 @@ impl<'l> OneWayOwned for LabelOption<&'l str>
 	}
 }
 
+#[allow(non_snake_case)]
+/// TODO
+pub fn TextColor<'l, T: IntoColor<&'l str>>(c: T) -> LabelOption<&'l str>
+{
+	TextColorOpt(c.into())
+}
+
 /// An enumeration of axis tick options
 #[derive(Copy, Clone, Debug, PartialOrd, PartialEq)]
 pub enum TickOption<T>