wip: ruby2652-ruby

6 files changed, 116 insertions, 152 deletions

diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 2b34cd25..f82c875d 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -193,10 +193,10 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 		0.5, dcp::VAlign::CENTER,
 		0, vector<dcp::Text::VariableZPosition>(),
 		dcp::Direction::LTR,
-		"Hello world",
+		string{"Hello world"},
 		dcp::Effect::NONE,
 		dcp::Colour(0, 0, 0),
-		dcp::Time(), dcp::Time(), 0, std::vector<dcp::Ruby>()
+		dcp::Time(), dcp::Time(), 0
 		));
 	subs_asset->write (dir / "subs.mxf");
 
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 27dcaf23..3b18148b 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -86,13 +86,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "My jacket was ",
+				   string{"My jacket was "},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -112,13 +111,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "Idi Amin's",
+				   string{"Idi Amin's"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   6,
-				   {}
+				   6
 				   ));
 
 	s = subs.texts_during(dcp::Time(0, 0, 7, 190, 250), dcp::Time(0, 0, 7, 191, 250), false);
@@ -141,13 +139,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "My corset was H.M. The Queen's",
+				   string{"My corset was H.M. The Queen's"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -167,13 +164,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "My large wonderbra",
+				   string{"My large wonderbra"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
@@ -196,13 +192,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "Once belonged to the Shah",
+				   string{"Once belonged to the Shah"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
@@ -225,13 +220,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "And these are Roy Hattersley's jeans",
+				   string{"And these are Roy Hattersley's jeans"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0,
-				   {}
+				   0
 				   ));
 }
 
@@ -260,13 +254,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "At afternoon tea with John Peel",
+				   string{"At afternoon tea with John Peel"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -286,13 +279,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "I enquired if his accent was real",
+				   string{"I enquired if his accent was real"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
@@ -315,13 +307,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "He said \"out of the house",
+				   string{"He said \"out of the house"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -341,13 +332,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "I'm incredibly scouse",
+				   string{"I'm incredibly scouse"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
@@ -370,13 +360,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "At home it depends how I feel.\"",
+				   string{"At home it depends how I feel.\""},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -396,13 +385,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "I spent a long weekend in Brighton",
+				   string{"I spent a long weekend in Brighton"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
@@ -425,13 +413,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::RTL,
-				   "With the legendary Miss Enid Blyton",
+				   string{"With the legendary Miss Enid Blyton"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -451,13 +438,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::TTB,
-				   "She said \"you be Noddy",
+				   string{"She said \"you be Noddy"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
@@ -480,13 +466,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::BTT,
-				   "That curious creature the Sphinx",
+				   string{"That curious creature the Sphinx"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -506,13 +491,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "Is smarter than anyone thinks",
+				   string{"Is smarter than anyone thinks"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
@@ -535,13 +519,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "It sits there and smirks",
+				   string{"It sits there and smirks"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -561,13 +544,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "And you don't think it works",
+				   string{"And you don't think it works"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
@@ -590,13 +572,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "Then when you're not looking, it winks.",
+				   string{"Then when you're not looking, it winks."},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -616,13 +597,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "When it snows you will find Sister Sledge",
+				   string{"When it snows you will find Sister Sledge"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
@@ -645,13 +625,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "Out mooning, at night, on the ledge",
+				   string{"Out mooning, at night, on the ledge"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -671,13 +650,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "One storey down",
+				   string{"One storey down"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 
 	s = subs.texts_during(dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
@@ -700,13 +678,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "HELLO",
+				   string{"HELLO"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 	BOOST_REQUIRE (dynamic_pointer_cast<const dcp::TextString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::TextString>(s.back()), dcp::TextString (
@@ -726,13 +703,12 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   0,
 				   vector<dcp::Text::VariableZPosition>(),
 				   dcp::Direction::LTR,
-				   "WORLD",
+				   string{"WORLD"},
 				   dcp::Effect::BORDER,
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0,
-				   {}
+				   0
 				   ));
 }
 
@@ -774,13 +750,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello world",
+			string{"Hello world"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -802,13 +777,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"What's going ",
+			string{"What's going "},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -830,13 +804,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"on",
+			string{"on"},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			9,
-			std::vector<dcp::Ruby>()
+			9
 			)
 		);
 
@@ -892,13 +865,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello world",
+			string{"Hello world"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -920,13 +892,12 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"What's going on",
+			string{"What's going on"},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 1a7ba853..90a34313 100644
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test1)
 	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part>());
 	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR, std::vector<dcp::Ruby>());
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
@@ -127,11 +127,11 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test2)
 	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part> ());
 	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR, std::vector<dcp::Ruby>());
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	text1->font._values["font"] = "Inconsolata";
 	text1->font._values["size"] = "42";
-	auto text2 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR, std::vector<dcp::Ruby>());
+	auto text2 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR);
 	sub1->children.push_back (text2);
 	text2->font._values["font"] = "Inconsolata";
 	text2->font._values["size"] = "48";
@@ -152,7 +152,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test3)
 	auto root = make_shared<dcp::order::Part>(shared_ptr<dcp::order::Part> ());
 	auto sub1 = make_shared<dcp::order::Subtitle>(root, dcp::Time(), dcp::Time(), dcp::Time(), dcp::Time());
 	root->children.push_back (sub1);
-	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR, std::vector<dcp::Ruby>());
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, optional<string>(), dcp::Direction::LTR);
 	sub1->children.push_back (text1);
 	dcp::order::Font font;
 	font._values["font"] = "Inconsolata";
@@ -222,6 +222,7 @@ BOOST_AUTO_TEST_CASE (format_xml_entities_test)
 BOOST_AUTO_TEST_CASE(ruby_round_trip_test)
 {
 	dcp::InteropTextAsset asset("test/data/ruby1.xml");
+	std::cout << asset.xml_as_string() << "\n";
 	check_xml(dcp::file_to_string("test/data/ruby1.xml"), asset.xml_as_string(), {}, false);
 }
 
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index d5094f87..dacf905a 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -68,13 +68,12 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello",
+			string{"Hello"},
 			dcp::Effect::NONE,
 			dcp::Colour(),
 			dcp::Time(0, 0, 0, 0, 24),
 			dcp::Time(0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 	subs.write("build/test/smpte_subtitle_id_test.mxf");
@@ -114,12 +113,14 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
 	BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea");
 	BOOST_REQUIRE_EQUAL(sc.texts().size(), 63U);
 	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front()));
-	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->text(), "Noch mal.");
+	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->string_text());
+	BOOST_CHECK_EQUAL(*dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->string_text(), "Noch mal.");
 	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().front())->space_before(), 0.0f);
 	BOOST_CHECK_EQUAL(sc.texts().front()->in(), dcp::Time (0, 0, 25, 12, 25));
 	BOOST_CHECK_EQUAL(sc.texts().front()->out(), dcp::Time (0, 0, 26, 4, 25));
 	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back()));
-	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->text(), "Prochainement");
+	BOOST_REQUIRE(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->string_text());
+	BOOST_CHECK_EQUAL(*dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->string_text(), "Prochainement");
 	BOOST_CHECK_EQUAL(dynamic_pointer_cast<const dcp::TextString>(sc.texts().back())->space_before(), 0.0f);
 	BOOST_CHECK_EQUAL(sc.texts().back()->in(), dcp::Time (0, 1, 57, 17, 25));
 	BOOST_CHECK_EQUAL(sc.texts().back()->out(), dcp::Time (0, 1, 58, 12, 25));
@@ -136,37 +137,43 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
 	auto i = 0;
 	auto is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "Testing is ");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "Testing is ");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "really");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "really");
 	BOOST_CHECK (is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), " fun!");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), " fun!");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 5, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "This is the ");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "This is the ");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), "second");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), "second");
 	BOOST_CHECK (is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 	++i;
 	is = dynamic_pointer_cast<const dcp::TextString>(subs[i]);
 	BOOST_REQUIRE (is);
-	BOOST_CHECK_EQUAL (is->text(), " line!");
+	BOOST_REQUIRE(is->string_text());
+	BOOST_CHECK_EQUAL(*is->string_text(), " line!");
 	BOOST_CHECK (!is->italic());
 	BOOST_CHECK_CLOSE (is->space_before(), 0, 0.1);
 }
@@ -199,13 +206,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			0.3,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello world",
+			string{"Hello world"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -227,13 +233,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::RTL,
-			"What's going ",
+			string{"What's going "},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -255,13 +260,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::RTL,
-			"on",
+			string{"on"},
 			dcp::Effect::BORDER,
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			4.2,
-			std::vector<dcp::Ruby>()
+			4.2
 			)
 		);
 
@@ -324,13 +328,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Testing is ",
+			string{"Testing is "},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -352,13 +355,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"really",
+			string{"really"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -380,13 +382,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			" fun",
+			string{" fun"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -408,13 +409,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"This is the ",
+			string{"This is the "},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -436,13 +436,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"second",
+			string{"second"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -464,13 +463,12 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			" line",
+			string{" line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -581,13 +579,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Top line",
+			string{"Top line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -609,13 +606,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Bottom line",
+			string{"Bottom line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -673,13 +669,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Top line",
+			string{"Top line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
@@ -701,13 +696,12 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			0,
 			vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Bottom line",
+			string{"Bottom line"},
 			dcp::Effect::NONE,
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 			)
 		);
 
diff --git a/test/test.cc b/test/test.cc
index 42e30303..36c69adc 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -412,13 +412,12 @@ simple_text()
 		0,
 		vector<dcp::Text::VariableZPosition>(),
 		dcp::Direction::LTR,
-		"Hello world",
+		string{"Hello world"},
 		dcp::Effect::NONE,
 		dcp::Colour(255, 255, 255),
 		dcp::Time(),
 		dcp::Time(),
-		0,
-		std::vector<dcp::Ruby>()
+		0
 		);
 }
 
diff --git a/test/verify_test.cc b/test/verify_test.cc
index dc5fa017..f85852a3 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -2098,8 +2098,7 @@ add_test_subtitle (shared_ptr<dcp::TextAsset> asset, int start_frame, int end_fr
 			dcp::Colour(),
 			dcp::Time(),
 			dcp::Time(),
-			0,
-			std::vector<dcp::Ruby>()
+			0
 		)
 	);
 }
@@ -5860,8 +5859,8 @@ BOOST_AUTO_TEST_CASE(overlapping_subtitles)
 			0, dcp::VAlign::CENTER,
 			0, vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"",
-			dcp::Effect::NONE, dcp::Colour{}, dcp::Time{}, dcp::Time{}, 0, vector<dcp::Ruby>{}
+			string{""},
+			dcp::Effect::NONE, dcp::Colour{}, dcp::Time{}, dcp::Time{}, 0
 			));
 
 	asset->add(std::make_shared<dcp::TextString>(
@@ -5873,8 +5872,8 @@ BOOST_AUTO_TEST_CASE(overlapping_subtitles)
 			0, dcp::VAlign::CENTER,
 			0, vector<dcp::Text::VariableZPosition>(),
 			dcp::Direction::LTR,
-			"Hello",
-			dcp::Effect::NONE, dcp::Colour{}, dcp::Time{}, dcp::Time{}, 0, vector<dcp::Ruby>{}
+			string{"Hello"},
+			dcp::Effect::NONE, dcp::Colour{}, dcp::Time{}, dcp::Time{}, 0
 			));
 
 	dcp::LinesCharactersResult result;