Simple pass-through of <Ruby> tags in subtitles.

7 files changed, 118 insertions, 50 deletions

diff --git a/test/data/ruby1.xml b/test/data/ruby1.xml
new file mode 100644
index 00000000..fe1d8adc
--- /dev/null
+++ b/test/data/ruby1.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DCSubtitle Version="1.0">
+  <SubtitleID>cab5c268-222b-41d2-88ae-6d6999441b17</SubtitleID>
+  <MovieTitle>Movie Title</MovieTitle>
+  <ReelNumber>1</ReelNumber>
+  <Language>French</Language>
+  <LoadFont Id="theFontId" URI="arial.ttf"/>
+  <Font AspectAdjust="1.0" Color="FFFFFFFF" Effect="border" EffectColor="FF000000" Id="theFontId" Italic="no" Script="normal" Size="39" Underlined="no" Weight="normal">
+    <Subtitle SpotNumber="1" TimeIn="00:00:05:198" TimeOut="00:00:07:115" FadeUpTime="1" FadeDownTime="1">
+      <Text VAlign="center" VPosition="0"><Ruby><Rb>Base</Rb><Rt Size="0.7" Position="after" Offset="0.1" Spacing="0.4" AspectAdjust="0.9">Annotate</Rt></Ruby>Hello world</Text>
+    </Subtitle>
+  </Font>
+</DCSubtitle>
+
diff --git a/test/decryption_test.cc b/test/decryption_test.cc
index 1e2ca94b..8f3dbff7 100644
--- a/test/decryption_test.cc
+++ b/test/decryption_test.cc
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE (decryption_test2)
 		"Hello world",
 		dcp::Effect::NONE,
 		dcp::Colour(0, 0, 0),
-		dcp::Time(), dcp::Time(), 0
+		dcp::Time(), dcp::Time(), 0, std::vector<dcp::Ruby>()
 		));
 	subs_asset->write (dir / "subs.mxf");
 
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index b477346c..0efca007 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -89,7 +89,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -113,7 +114,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   6
+				   6,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
@@ -140,7 +142,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -164,7 +167,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
@@ -191,7 +195,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
@@ -218,7 +223,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 1, 250),
 				   dcp::Time (0, 0, 0, 1, 250),
-				   0
+				   0,
+				   {}
 				   ));
 }
 
@@ -251,7 +257,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -275,7 +282,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
@@ -302,7 +310,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -326,7 +335,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour (0, 0, 0),
 				   dcp::Time (0, 0, 0, 0, 250),
 				   dcp::Time (0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
@@ -353,7 +363,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -377,7 +388,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
@@ -404,7 +416,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -428,7 +441,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
@@ -455,7 +469,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -479,7 +494,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
@@ -506,7 +522,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -530,7 +547,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
@@ -557,7 +575,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -581,7 +600,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
@@ -608,7 +628,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -632,7 +653,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 
 	s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
@@ -659,7 +681,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   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::SubtitleString>(s.back()));
 	BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
@@ -683,7 +706,8 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
 				   dcp::Colour(0, 0, 0),
 				   dcp::Time(0, 0, 0, 0, 250),
 				   dcp::Time(0, 0, 0, 0, 250),
-				   0
+				   0,
+				   {}
 				   ));
 }
 
@@ -729,7 +753,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -755,7 +780,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -781,7 +807,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			9
+			9,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -841,7 +868,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -867,7 +895,8 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 69ae2be4..7ac20e10 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, dcp::Direction::LTR);
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR, std::vector<dcp::Ruby>());
 	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, dcp::Direction::LTR);
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR, std::vector<dcp::Ruby>());
 	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, dcp::Direction::LTR);
+	auto text2 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR, std::vector<dcp::Ruby>());
 	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, dcp::Direction::LTR);
+	auto text1 = make_shared<dcp::order::Text>(sub1, dcp::HAlign::CENTER, 0, dcp::VAlign::TOP, 0, 0, dcp::Direction::LTR, std::vector<dcp::Ruby>());
 	sub1->children.push_back (text1);
 	dcp::order::Font font;
 	font._values["font"] = "Inconsolata";
@@ -217,3 +217,12 @@ BOOST_AUTO_TEST_CASE (format_xml_entities_test)
 "  <Bar>Don't panic &amp;amp; xml \"is\" 'great' &amp; &lt; &gt; —</Bar>\n"
 "</Foo>\n");
 }
+
+
+BOOST_AUTO_TEST_CASE(ruby_round_trip_test)
+{
+	dcp::InteropSubtitleAsset asset("test/data/ruby1.xml");
+	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 414d392d..eca5cd1f 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -72,7 +72,8 @@ BOOST_AUTO_TEST_CASE (smpte_subtitle_id_test)
 			dcp::Colour(),
 			dcp::Time(0, 0, 0, 0, 24),
 			dcp::Time(0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 	subs.write("build/test/smpte_subtitle_id_test.mxf");
@@ -201,7 +202,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -227,7 +229,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -253,7 +256,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 			dcp::Colour (1, 2, 3),
 			dcp::Time (1, 2, 3, 4, 24),
 			dcp::Time (5, 6, 7, 8, 24),
-			4.2
+			4.2,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -320,7 +324,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -346,7 +351,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -372,7 +378,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -398,7 +405,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -424,7 +432,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -450,7 +459,8 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -564,7 +574,8 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -590,7 +601,8 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -652,7 +664,8 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
@@ -678,7 +691,8 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 			dcp::Colour (0, 0, 0),
 			dcp::Time (0, 0, 0, 0, 24),
 			dcp::Time (0, 0, 0, 0, 24),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 			)
 		);
 
diff --git a/test/test.cc b/test/test.cc
index bff647d7..d384bdfa 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -417,7 +417,8 @@ simple_subtitle ()
 		dcp::Colour(255, 255, 255),
 		dcp::Time(),
 		dcp::Time(),
-		0
+		0,
+		std::vector<dcp::Ruby>()
 		);
 }
 
diff --git a/test/verify_test.cc b/test/verify_test.cc
index 2de443e3..a1a2d280 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1335,7 +1335,8 @@ add_test_subtitle (shared_ptr<dcp::SubtitleAsset> asset, int start_frame, int en
 			dcp::Colour(),
 			dcp::Time(),
 			dcp::Time(),
-			0
+			0,
+			std::vector<dcp::Ruby>()
 		)
 	);
 }