Rename color -> colour.

14 files changed, 117 insertions, 117 deletions

diff --git a/src/colour_matrix.cc b/src/colour_matrix.cc
index 72f952c3..1a997326 100644
--- a/src/colour_matrix.cc
+++ b/src/colour_matrix.cc
@@ -19,7 +19,7 @@
 
 #include "colour_matrix.h"
 
-/* sRGB color matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
+/* sRGB colour matrix for XYZ -> RGB.  This is the same as the one used by the Fraunhofer
    EasyDCP player, I think.
 */
 
diff --git a/src/font.cc b/src/font.cc
index f43e83df..99f49f90 100644
--- a/src/font.cc
+++ b/src/font.cc
@@ -39,7 +39,7 @@ Font::Font (boost::shared_ptr<const cxml::Node> node)
 	italic = node->optional_bool_attribute ("Italic");
 	optional<string> c = node->optional_string_attribute ("Color");
 	if (c) {
-		color = Color (c.get ());
+		colour = Colour (c.get ());
 	}
 	optional<string> const e = node->optional_string_attribute ("Effect");
 	if (e) {
@@ -47,7 +47,7 @@ Font::Font (boost::shared_ptr<const cxml::Node> node)
 	}
 	c = node->optional_string_attribute ( "EffectColor");
 	if (c) {
-		effect_color = Color (c.get ());
+		effect_colour = Colour (c.get ());
 	}
 	subtitle_nodes = type_children<Subtitle> (node, "Subtitle");
 	font_nodes = type_children<Font> (node, "Font");
@@ -57,8 +57,8 @@ Font::Font (boost::shared_ptr<const cxml::Node> node)
 Font::Font (std::list<boost::shared_ptr<Font> > const & font_nodes)
 	: size (0)
 	, italic (false)
-	, color ("FFFFFFFF")
-	, effect_color ("FFFFFFFF")
+	, colour ("FFFFFFFF")
+	, effect_colour ("FFFFFFFF")
 {
 	for (list<shared_ptr<Font> >::const_iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) {
 		if ((*i)->id) {
@@ -70,14 +70,14 @@ Font::Font (std::list<boost::shared_ptr<Font> > const & font_nodes)
 		if ((*i)->italic) {
 			italic = (*i)->italic.get ();
 		}
-		if ((*i)->color) {
-			color = (*i)->color.get ();
+		if ((*i)->colour) {
+			colour = (*i)->colour.get ();
 		}
 		if ((*i)->effect) {
 			effect = (*i)->effect.get ();
 		}
-		if ((*i)->effect_color) {
-			effect_color = (*i)->effect_color.get ();
+		if ((*i)->effect_colour) {
+			effect_colour = (*i)->effect_colour.get ();
 		}
 	}
 }
diff --git a/src/font.h b/src/font.h
index 979166cd..d5ea5636 100644
--- a/src/font.h
+++ b/src/font.h
@@ -50,9 +50,9 @@ public:
 	boost::optional<std::string> id;
 	int size;
 	boost::optional<bool> italic;
-	boost::optional<Color> color;
+	boost::optional<Colour> colour;
 	boost::optional<Effect> effect;
-	boost::optional<Color> effect_color;
+	boost::optional<Colour> effect_colour;
 	
 	std::list<boost::shared_ptr<Subtitle> > subtitle_nodes;
 	std::list<boost::shared_ptr<Font> > font_nodes;
diff --git a/src/interop_subtitle_content.cc b/src/interop_subtitle_content.cc
index 0fdee0b4..09b30e99 100644
--- a/src/interop_subtitle_content.cc
+++ b/src/interop_subtitle_content.cc
@@ -86,10 +86,10 @@ InteropSubtitleContent::xml_as_string () const
 
 	optional<string> font;
 	bool italic = false;
-	Color color;
+	Colour colour;
 	int size = 0;
 	Effect effect = NONE;
-	Color effect_color;
+	Colour effect_colour;
 	int spot_number = 1;
 	Time last_in;
 	Time last_out;
@@ -109,18 +109,18 @@ InteropSubtitleContent::xml_as_string () const
 		bool const font_changed =
 			font         != i->font()         ||
 			italic       != i->italic()       ||
-			color        != i->color()        ||
+			colour        != i->colour()        ||
 			size         != i->size()         ||
 			effect       != i->effect()       ||
-			effect_color != i->effect_color();
+			effect_colour != i->effect_colour();
 
 		if (font_changed) {
 			font = i->font ();
 			italic = i->italic ();
-			color = i->color ();
+			colour = i->colour ();
 			size = i->size ();
 			effect = i->effect ();
-			effect_color = i->effect_color ();
+			effect_colour = i->effect_colour ();
 		}
 
 		if (!font_element || font_changed) {
@@ -129,10 +129,10 @@ InteropSubtitleContent::xml_as_string () const
 				font_element->set_attribute ("Id", font.get ());
 			}
 			font_element->set_attribute ("Italic", italic ? "yes" : "no");
-			font_element->set_attribute ("Color", color.to_argb_string());
+			font_element->set_attribute ("Color", colour.to_argb_string());
 			font_element->set_attribute ("Size", raw_convert<string> (size));
 			font_element->set_attribute ("Effect", effect_to_string (effect));
-			font_element->set_attribute ("EffectColor", effect_color.to_argb_string());
+			font_element->set_attribute ("EffectColor", effect_colour.to_argb_string());
 			font_element->set_attribute ("Script", "normal");
 			font_element->set_attribute ("Underlined", "no");
 			font_element->set_attribute ("Weight", "normal");
diff --git a/src/subtitle_content.cc b/src/subtitle_content.cc
index 592bfc62..1b5e6a1b 100644
--- a/src/subtitle_content.cc
+++ b/src/subtitle_content.cc
@@ -132,7 +132,7 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state
 		SubtitleString (
 			effective_font.id,
 			effective_font.italic.get(),
-			effective_font.color.get(),
+			effective_font.colour.get(),
 			effective_font.size,
 			effective_subtitle.in,
 			effective_subtitle.out,
@@ -140,7 +140,7 @@ SubtitleContent::maybe_add_subtitle (string text, ParseState const & parse_state
 			effective_text.v_align,
 			text,
 			effective_font.effect ? effective_font.effect.get() : NONE,
-			effective_font.effect_color.get(),
+			effective_font.effect_colour.get(),
 			effective_subtitle.fade_up_time,
 			effective_subtitle.fade_down_time
 			)
diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index a92eac92..a8dfd555 100644
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -28,7 +28,7 @@ using namespace dcp;
 SubtitleString::SubtitleString (
 	optional<string> font,
 	bool italic,
-	Color color,
+	Colour colour,
 	int size,
 	Time in,
 	Time out,
@@ -36,13 +36,13 @@ SubtitleString::SubtitleString (
 	VAlign v_align,
 	string text,
 	Effect effect,
-	Color effect_color,
+	Colour effect_colour,
 	Time fade_up_time,
 	Time fade_down_time
 	)
 	: _font (font)
 	, _italic (italic)
-	, _color (color)
+	, _colour (colour)
 	, _size (size)
 	, _in (in)
 	, _out (out)
@@ -50,7 +50,7 @@ SubtitleString::SubtitleString (
 	, _v_align (v_align)
 	, _text (text)
 	, _effect (effect)
-	, _effect_color (effect_color)
+	, _effect_colour (effect_colour)
 	, _fade_up_time (fade_up_time)
 	, _fade_down_time (fade_down_time)
 {
@@ -74,7 +74,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b)
 	return (
 		a.font() == b.font() &&
 		a.italic() == b.italic() &&
-		a.color() == b.color() &&
+		a.colour() == b.colour() &&
 		a.size() == b.size() &&
 		a.in() == b.in() &&
 		a.out() == b.out() &&
@@ -82,7 +82,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b)
 		a.v_align() == b.v_align() &&
 		a.text() == b.text() &&
 		a.effect() == b.effect() &&
-		a.effect_color() == b.effect_color() &&
+		a.effect_colour() == b.effect_colour() &&
 		a.fade_up_time() == b.fade_up_time() &&
 		a.fade_down_time() == b.fade_down_time()
 		);
@@ -101,8 +101,8 @@ dcp::operator<< (ostream& s, SubtitleString const & sub)
 		s << "non-italic";
 	}
 	
-	s << ", size " << sub.size() << ", color " << sub.color() << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ";\n"
-	  << "effect " << ((int) sub.effect()) << ", effect color " << sub.effect_color();
+	s << ", size " << sub.size() << ", colour " << sub.colour() << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align()) << ";\n"
+	  << "effect " << ((int) sub.effect()) << ", effect colour " << sub.effect_colour();
 
 	return s;
 }
diff --git a/src/subtitle_string.h b/src/subtitle_string.h
index 512a1b5b..0f066164 100644
--- a/src/subtitle_string.h
+++ b/src/subtitle_string.h
@@ -40,7 +40,7 @@ public:
 	SubtitleString (
 		boost::optional<std::string> font,
 		bool italic,
-		Color color,
+		Colour colour,
 		int size,
 		Time in,
 		Time out,
@@ -48,7 +48,7 @@ public:
 		VAlign v_align,
 		std::string text,
 		Effect effect,
-		Color effect_color,
+		Colour effect_colour,
 		Time fade_up_time,
 		Time fade_down_time
 		);
@@ -62,8 +62,8 @@ public:
 		return _italic;
 	}
 
-	Color color () const {
-		return _color;
+	Colour colour () const {
+		return _colour;
 	}
 
 	Time in () const {
@@ -93,8 +93,8 @@ public:
 		return _effect;
 	}
 
-	Color effect_color () const {
-		return _effect_color;
+	Colour effect_colour () const {
+		return _effect_colour;
 	}
 
 	Time fade_up_time () const {
@@ -128,7 +128,7 @@ private:
 	/** true if the text is italic */
 	bool _italic;
 	/** text colour */
-	Color _color;
+	Colour _colour;
 	/** Size in points as if the screen height is 11 inches, so a 72pt font
 	 *  would be 1/11th of the screen height.
 	 */ 
@@ -142,7 +142,7 @@ private:
 	VAlign _v_align;
 	std::string _text;
 	Effect _effect;
-	Color _effect_color;
+	Colour _effect_colour;
 	Time _fade_up_time;
 	Time _fade_down_time;
 };
diff --git a/src/types.cc b/src/types.cc
index fc6d50f3..c97fb7b4 100644
--- a/src/types.cc
+++ b/src/types.cc
@@ -55,8 +55,8 @@ dcp::operator!= (Fraction const & a, Fraction const & b)
 	return (a.numerator != b.numerator || a.denominator != b.denominator);
 }
 
-/** Construct a Color, initialising it to black. */
-Color::Color ()
+/** Construct a Colour, initialising it to black. */
+Colour::Colour ()
 	: r (0)
 	, g (0)
 	, b (0)
@@ -64,10 +64,10 @@ Color::Color ()
 
 }
 
-/** Construct a Color from R, G and B.  The values run between
+/** Construct a Colour from R, G and B.  The values run between
  *  0 and 255.
  */
-Color::Color (int r_, int g_, int b_)
+Colour::Colour (int r_, int g_, int b_)
 	: r (r_)
 	, g (g_)
 	, b (b_)
@@ -75,11 +75,11 @@ Color::Color (int r_, int g_, int b_)
 
 }
 
-/** Construct a Color from an ARGB hex string; the alpha value is ignored.
+/** Construct a Colour from an ARGB hex string; the alpha value is ignored.
  *  @param argb_hex A string of the form AARRGGBB, where e.g. RR is a two-character
  *  hex value.
  */
-Color::Color (string argb_hex)
+Colour::Colour (string argb_hex)
 {
 	int alpha;
 	if (sscanf (argb_hex.c_str(), "%2x%2x%2x%2x", &alpha, &r, &g, &b) < 4) {
@@ -91,7 +91,7 @@ Color::Color (string argb_hex)
  *  hex value.  The alpha value will always be FF (ie 255; maximum alpha).
  */
 string
-Color::to_argb_string () const
+Colour::to_argb_string () const
 {
 	stringstream s;
 	s << "FF";
@@ -105,28 +105,28 @@ Color::to_argb_string () const
 	return t;
 }
 
-/** operator== for Colors.
- *  @param a First color to compare.
- *  @param b Second color to compare.
+/** operator== for Colours.
+ *  @param a First colour to compare.
+ *  @param b Second colour to compare.
  */
 bool
-dcp::operator== (Color const & a, Color const & b)
+dcp::operator== (Colour const & a, Colour const & b)
 {
 	return (a.r == b.r && a.g == b.g && a.b == b.b);
 }
 
-/** operator!= for Colors.
- *  @param a First color to compare.
- *  @param b Second color to compare.
+/** operator!= for Colours.
+ *  @param a First colour to compare.
+ *  @param b Second colour to compare.
  */
 bool
-dcp::operator!= (Color const & a, Color const & b)
+dcp::operator!= (Colour const & a, Colour const & b)
 {
 	return !(a == b);
 }
 
 ostream &
-dcp::operator<< (ostream& s, Color const & c)
+dcp::operator<< (ostream& s, Colour const & c)
 {
 	s << "(" << c.r << ", " << c.g << ", " << c.b << ")";
 	return s;
diff --git a/src/types.h b/src/types.h
index 98244891..f685806f 100644
--- a/src/types.h
+++ b/src/types.h
@@ -164,15 +164,15 @@ enum Formulation {
 	DCI_SPECIFIC
 };
 
-/** @class Color
- *  @brief An RGB color (aka colour).
+/** @class Colour
+ *  @brief An RGB colour.
  */
-class Color
+class Colour
 {
 public:
-	Color ();
-	Color (int r_, int g_, int b_);
-	Color (std::string argb_hex);
+	Colour ();
+	Colour (int r_, int g_, int b_);
+	Colour (std::string argb_hex);
 
 	int r; ///< red component, from 0 to 255
 	int g; ///< green component, from 0 to 255
@@ -181,9 +181,9 @@ public:
 	std::string to_argb_string () const;
 };
 
-extern bool operator== (Color const & a, Color const & b);
-extern bool operator!= (Color const & a, Color const & b);
-extern std::ostream & operator<< (std::ostream & s, Color const & c);
+extern bool operator== (Colour const & a, Colour const & b);
+extern bool operator!= (Colour const & a, Colour const & b);
+extern std::ostream & operator<< (std::ostream & s, Colour const & c);
 
 typedef std::pair<std::string, boost::shared_ptr<const parse::AssetMap> > PathAssetMap;
 
diff --git a/test/color_test.cc b/test/colour_test.cc
index d68f59d4..5efccead 100644
--- a/test/color_test.cc
+++ b/test/colour_test.cc
@@ -21,24 +21,24 @@
 
 #include "util.h"
 
-/* Check that dcp::Color works */
-BOOST_AUTO_TEST_CASE (color)
+/* Check that dcp::Colour works */
+BOOST_AUTO_TEST_CASE (colour)
 {
-	dcp::Color c ("FFFF0000");
+	dcp::Colour c ("FFFF0000");
 
 	BOOST_CHECK_EQUAL (c.r, 255);
 	BOOST_CHECK_EQUAL (c.g, 0);
 	BOOST_CHECK_EQUAL (c.b, 0);
 	BOOST_CHECK_EQUAL (c.to_argb_string(), "FFFF0000");
 
-	c = dcp::Color ("FF00FF00");
+	c = dcp::Colour ("FF00FF00");
 
 	BOOST_CHECK_EQUAL (c.r, 0);
 	BOOST_CHECK_EQUAL (c.g, 255);
 	BOOST_CHECK_EQUAL (c.b, 0);
 	BOOST_CHECK_EQUAL (c.to_argb_string(), "FF00FF00");
 
-	c = dcp::Color ("FF0000FF");
+	c = dcp::Colour ("FF0000FF");
 
 	BOOST_CHECK_EQUAL (c.r, 0);
 	BOOST_CHECK_EQUAL (c.g, 0);
diff --git a/test/opendcp_lut.h b/test/opendcp_lut.h
index d8fbd930..f25afd4c 100644
--- a/test/opendcp_lut.h
+++ b/test/opendcp_lut.h
@@ -49,7 +49,7 @@ enum LUT_OUT_ENUM {
     LO_MAX
 };
 
-extern float color_matrix[3][3][3];
+extern float colour_matrix[3][3][3];
 extern float lut_in[LI_MAX][4095+1];
 extern int lut_out[1][DCI_LUT_SIZE];
 
diff --git a/test/subtitle_tests.cc b/test/subtitle_tests.cc
index e8175cbb..c7137bec 100644
--- a/test/subtitle_tests.cc
+++ b/test/subtitle_tests.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 5, 198),
 				   dcp::Time (0, 0, 7, 115),
@@ -45,7 +45,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "My jacket was Idi Amin's",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 7, 177),
 				   dcp::Time (0, 0, 11, 31),
@@ -63,14 +63,14 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "My corset was H.M. The Queen's",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 7, 177),
 				   dcp::Time (0, 0, 11, 31),
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "My large wonderbra",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -88,7 +88,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 11, 94),
 				   dcp::Time (0, 0, 13, 63),
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "Once belonged to the Shah",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -106,7 +106,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFontId"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   39,
 				   dcp::Time (0, 0, 13, 104),
 				   dcp::Time (0, 0, 15, 177),
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE (subtitles1)
 				   dcp::BOTTOM,
 				   "And these are Roy Hattersley's jeans",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1),
 				   dcp::Time (0, 0, 0, 1)
 				   ));
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 41, 62),
 				   dcp::Time (0, 0, 43, 52),
@@ -138,14 +138,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "At afternoon tea with John Peel",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 41, 62),
 				   dcp::Time (0, 0, 43, 52),
@@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "I enquired if his accent was real",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -163,7 +163,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 50, 42),
 				   dcp::Time (0, 0, 52, 21),
@@ -171,14 +171,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "He said \"out of the house",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 0, 50, 42),
 				   dcp::Time (0, 0, 52, 21),
@@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "I'm incredibly scouse",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 2, 208),
 				   dcp::Time (0, 1, 4, 10),
@@ -204,14 +204,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "At home it depends how I feel.\"",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 2, 208),
 				   dcp::Time (0, 1, 4, 10),
@@ -219,7 +219,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "I spent a long weekend in Brighton",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -229,7 +229,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 15, 42),
 				   dcp::Time (0, 1, 16, 42),
@@ -237,14 +237,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "With the legendary Miss Enid Blyton",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 15, 42),
 				   dcp::Time (0, 1, 16, 42),
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "She said \"you be Noddy",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -262,7 +262,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 27, 115),
 				   dcp::Time (0, 1, 28, 208),
@@ -270,14 +270,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "That curious creature the Sphinx",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 27, 115),
 				   dcp::Time (0, 1, 28, 208),
@@ -285,7 +285,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "Is smarter than anyone thinks",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 42, 229),
 				   dcp::Time (0, 1, 45, 62),
@@ -303,14 +303,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "It sits there and smirks",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 42, 229),
 				   dcp::Time (0, 1, 45, 62),
@@ -318,7 +318,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "And you don't think it works",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -328,7 +328,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 45, 146),
 				   dcp::Time (0, 1, 47, 94),
@@ -336,14 +336,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "Then when you're not looking, it winks.",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 45, 146),
 				   dcp::Time (0, 1, 47, 94),
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "When it snows you will find Sister Sledge",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -361,7 +361,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 47, 146),
 				   dcp::Time (0, 1, 48, 167),
@@ -369,14 +369,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "Out mooning, at night, on the ledge",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   false,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 1, 47, 146),
 				   dcp::Time (0, 1, 48, 167),
@@ -384,7 +384,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "One storey down",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
@@ -394,7 +394,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 	BOOST_CHECK_EQUAL (s.front(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 2, 5, 208),
 				   dcp::Time (0, 2, 7, 31),
@@ -402,14 +402,14 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "HELLO",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
 	BOOST_CHECK_EQUAL (s.back(), dcp::SubtitleString (
 				   string ("theFont"),
 				   true,
-				   dcp::Color (255, 255, 255),
+				   dcp::Colour (255, 255, 255),
 				   42,
 				   dcp::Time (0, 2, 5, 208),
 				   dcp::Time (0, 2, 7, 31),
@@ -417,7 +417,7 @@ BOOST_AUTO_TEST_CASE (subtitles2)
 				   dcp::TOP,
 				   "WORLD",
 				   dcp::BORDER,
-				   dcp::Color (0, 0, 0),
+				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0),
 				   dcp::Time (0, 0, 0, 0)
 				   ));
diff --git a/test/wscript b/test/wscript
index 7e7122b1..1ac7cb3e 100644
--- a/test/wscript
+++ b/test/wscript
@@ -22,7 +22,7 @@ def build(bld):
     obj.use    = 'libdcp%s' % bld.env.API_VERSION
     obj.source = """
                  certificates_test.cc
-                 color_test.cc
+                 colour_test.cc
                  cpl_sar_test.cc
                  dcp_test.cc
                  dcp_time_test.cc
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index 0bf0df08..1ebc4d95 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -87,13 +87,13 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles)
 			cout << "          "
 			     << "font:" << k->font().get_value_or("[default]") << "; "
 			     << "italic:" << k->italic() << "; "
-			     << "color:" << k->color() << "; "
+			     << "color:" << k->colour() << "; "
 			     << "in:" << k->in() << "; "
 			     << "out:" << k->out() << "; "
 			     << "v_position:" << k->v_position() << "; "
 			     << "v_align:" << k->v_align() << "; "
 			     << "effect:" << k->effect() << "; "
-			     << "effect_color:" << k->effect_color() << "; "
+			     << "effect_color:" << k->effect_colour() << "; "
 			     << "fade_up_time:" << k->fade_up_time() << "; "
 			     << "fade_down_time:" << k->fade_down_time() << "; "
 			     << "size: " << k->size() << "\n";