Escape more things.

Fixes #66.

gnuplot/Cargo.toml

@@ -115,5 +115,10 @@ path = "examples/multiplot_options.rs"
 name = "multiple_axes"
 path = "examples/multiple_axes.rs"
 
+[[example]]
+
+name = "text"
+path = "examples/text.rs"
+
 [dependencies]
 byteorder = "1.3.1"

gnuplot/examples/text.rs

@@ -0,0 +1,65 @@
+// This file is released into Public Domain.
+use crate::common::*;
+use gnuplot::*;
+
+mod common;
+
+fn example(c: Common)
+{
+	let mut fg = Figure::new();
+	let _ax = fg
+		.axes2d()
+		.label(
+			"multi\nline string",
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.9),
+			&[],
+		)
+		.label(
+			"x^2 x_2 {/Times*2 abc} \\{\\}\\^\\_",
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.8),
+			&[],
+		)
+		.label(
+			"Monospace",
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.6),
+			&[Font("Monospace", 32.)],
+		)
+		.label(
+			"Align Right",
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.5),
+			&[TextAlign(AlignRight)],
+		)
+		.label(
+			"Align Centre",
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.4),
+			&[TextAlign(AlignCenter)],
+		)
+		.label(
+			"~{Over}{Print}", // Why does gnuplot have this feature?
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.3),
+			&[TextAlign(AlignCenter)],
+		)
+		.label(
+			"Tab\tCharacter", // Strange rendering on this one
+			Coordinate::Graph(0.5),
+			Coordinate::Graph(0.2),
+			&[TextAlign(AlignCenter)],
+		)
+		.lines(&[-2., -2.], &[-3., 3.], &[])
+		.set_x_ticks(None, &[], &[])
+		.set_y_ticks(None, &[], &[])
+		.set_border(true, &[], &[]);
+
+	c.show(&mut fg, "text");
+}
+
+fn main()
+{
+	Common::new().map(|c| example(c));
+}

gnuplot/src/util.rs

@@ -65,9 +65,20 @@ impl<'l, T: OneWayOwned> OneWayOwned for &'l [T]
 
 pub(crate) fn escape(s: &str) -> String
 {
-	let s = s.replace(r"\", r"\\");
-	let s = s.replace(r#"""#, r#"\""#);
-	s
+	let mut res = String::with_capacity(s.len());
+
+	for c in s.chars()
+	{
+		match c
+		{
+			'\\' => res.push_str(r"\\"),
+			'\n' => res.push_str(r"\n"),
+			'\t' => res.push_str(r"\t"),
+			'"' => res.push_str(r#"\""#),
+			c @ _ => res.push(c),
+		}
+	}
+	res
 }
 
 #[test]
@@ -77,4 +88,5 @@ fn escape_test()
 	assert_eq!(r"\\\\", escape(r"\\"));
 	assert_eq!(r#"\\\""#, escape(r#"\""#));
 	assert_eq!(r#"\"\""#, escape(r#""""#));
+	assert_eq!(r"\n", escape("\n"));
 }