fixup! Nearly pretty-print subtitle XML (though not in <Text> nodes).2205-subtitle-formatting

author: Carl Hetherington <cth@carlh.net> 2022-03-20 20:59:28 +0100
committer: Carl Hetherington <cth@carlh.net> 2022-03-20 20:59:28 +0100
commit: 2fa6122a3cfa0e801f4a36b39f50e0bf7d575e4b (patch)
tree: b8de41fec71f78debe97ee9fcdd8dc3be65f9b45 /test
parent: ec87fa55c5909ae85429fc5344469cf284e5f6b3 (diff)
7 files changed, 129 insertions, 117 deletions
diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index ff0940b0..3369fc24 100644
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -762,21 +762,21 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test)
 	c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
 	check_xml (
-		"<DCSubtitle Version=\"1.0\">"
-		  "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
-		  "<MovieTitle>Test</MovieTitle>"
-		  "<ReelNumber>1</ReelNumber>"
-		  "<Language>EN</Language>"
-		  "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
-		    "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
-		      "<Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
-		    "</Subtitle>"
-		  "</Font>"
-		  "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
-		    "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
-		      "<Text VAlign=\"bottom\" VPosition=\"40\">What's going <Space Size=\"9em\"/>on</Text>"
-		    "</Subtitle>"
-		  "</Font>"
+		"<DCSubtitle Version=\"1.0\">\n"
+		"  <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>\n"
+		"  <MovieTitle>Test</MovieTitle>\n"
+		"  <ReelNumber>1</ReelNumber>\n"
+		"  <Language>EN</Language>\n"
+		"  <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">\n"
+		"    <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n"
+		"      <Text VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n"
+		"    </Subtitle>\n"
+		"  </Font>\n"
+		"  <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">\n"
+		"    <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">\n"
+		"      <Text VAlign=\"bottom\" VPosition=\"40\">What's going <Space Size=\"9em\"/>on</Text>\n"
+		"    </Subtitle>\n"
+		"  </Font>\n"
 		"</DCSubtitle>",
 		c.xml_as_string (),
 		vector<string>()
@@ -846,21 +846,21 @@ BOOST_AUTO_TEST_CASE (write_interop_subtitle_test2)
 	c._id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
 	check_xml (
-		"<DCSubtitle Version=\"1.0\">"
-		  "<SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>"
-		  "<MovieTitle>Test</MovieTitle>"
-		  "<ReelNumber>1</ReelNumber>"
-		  "<Language>EN</Language>"
-		  "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">"
-		    "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">"
-		      "<Text HPosition=\"-20\" VAlign=\"top\" VPosition=\"80\">Hello world</Text>"
-		    "</Subtitle>"
-		  "</Font>"
-		  "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">"
-		    "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">"
-		      "<Text HPosition=\"-20\" VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>"
-		    "</Subtitle>"
-		  "</Font>"
+		"<DCSubtitle Version=\"1.0\">\n"
+		"  <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>\n"
+		"  <MovieTitle>Test</MovieTitle>\n"
+		"  <ReelNumber>1</ReelNumber>\n"
+		"  <Language>EN</Language>\n"
+		"  <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" Id=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underlined=\"no\" Weight=\"normal\">\n"
+		"    <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:229\" TimeOut=\"00:04:11:229\" FadeUpTime=\"0\" FadeDownTime=\"0\">\n"
+		"      <Text HPosition=\"-20\" VAlign=\"top\" VPosition=\"80\">Hello world</Text>\n"
+		"    </Subtitle>\n"
+		"  </Font>\n"
+		"  <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underlined=\"yes\" Weight=\"bold\">\n"
+		"    <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:219\" TimeOut=\"06:12:15:219\" FadeUpTime=\"930792\" FadeDownTime=\"4591834\">\n"
+		"      <Text HPosition=\"-20\" VAlign=\"bottom\" VPosition=\"40\">What's going on</Text>\n"
+		"    </Subtitle>\n"
+		"  </Font>\n"
 		"</DCSubtitle>",
 		c.xml_as_string (),
 		vector<string>()
diff --git a/test/ref/write_interop_subtitle_test3/ASSETMAP b/test/ref/write_interop_subtitle_test3/ASSETMAP
index 7c901513..570b0d5b 100644
--- a/test/ref/write_interop_subtitle_test3/ASSETMAP
+++ b/test/ref/write_interop_subtitle_test3/ASSETMAP
@@ -37,7 +37,7 @@
           <Path>subs.xml</Path>
           <VolumeIndex>1</VolumeIndex>
           <Offset>0</Offset>
-          <Length>414</Length>
+          <Length>438</Length>
         </Chunk>
       </ChunkList>
     </Asset>
diff --git a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
index 2da8e910..6f192259 100644
--- a/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
+++ b/test/ref/write_interop_subtitle_test3/pkl_e94b8a0d-27f7-408a-af16-78d3df419a91.xml
@@ -9,15 +9,15 @@
     <Asset>
       <Id>urn:uuid:46c3eb45-15e5-47d6-8684-d8641e4dc516</Id>
       <AnnotationText>46c3eb45-15e5-47d6-8684-d8641e4dc516</AnnotationText>
-      <Hash>614bJ4VLsNZ6mLbdXbZXjGuoSsY=</Hash>
+      <Hash>Y8rZTMi93JjmkgwFK7Fu3W5rz/Y=</Hash>
       <Size>1061</Size>
       <Type>text/xml;asdcpKind=CPL</Type>
     </Asset>
     <Asset>
       <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>
       <AnnotationText>a6c58cff-3e1e-4b38-acec-a42224475ef6</AnnotationText>
-      <Hash>cVnFjMLTQnSIAlIzJpNB/p7B230=</Hash>
-      <Size>414</Size>
+      <Hash>ilLkOSjxgHZxkAdOPVJBoDFiUh8=</Hash>
+      <Size>438</Size>
       <Type>text/xml;asdcpKind=Subtitle</Type>
     </Asset>
     <Asset>
diff --git a/test/ref/write_interop_subtitle_test3/subs.xml b/test/ref/write_interop_subtitle_test3/subs.xml
index d1c8fa7e..050ee930 100644
--- a/test/ref/write_interop_subtitle_test3/subs.xml
+++ b/test/ref/write_interop_subtitle_test3/subs.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<DCSubtitle Version="1.0"><SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID><MovieTitle>Test</MovieTitle><ReelNumber>1</ReelNumber><Language>EN</Language><Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0"><Image VAlign="top" VPosition="80">d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Image></Subtitle></DCSubtitle>
+<DCSubtitle Version="1.0">
+  <SubtitleID>a6c58cff-3e1e-4b38-acec-a42224475ef6</SubtitleID>
+  <MovieTitle>Test</MovieTitle>
+  <ReelNumber>1</ReelNumber>
+  <Language>EN</Language>
+  <Subtitle SpotNumber="1" TimeIn="00:04:09:229" TimeOut="00:04:11:229" FadeUpTime="0" FadeDownTime="0">
+    <Image VAlign="top" VPosition="80">d36f4bb3-c4fa-4a95-9915-6fec3110cd71.png</Image>
+  </Subtitle>
+</DCSubtitle>
diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index 2231d631..ae05642a 100644
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -205,3 +205,15 @@ BOOST_AUTO_TEST_CASE (format_xml_test2)
 	check_xml (dcp::file_to_string(private_test / "DKH_UT_EN20160601def.reformatted.xml"), dcp::SubtitleAsset::format_xml(*document, {}), {});
 }
 
+
+BOOST_AUTO_TEST_CASE (format_xml_entities_test)
+{
+	xmlpp::Document doc;
+	auto root = doc.create_root_node("Foo");
+	root->add_child("Bar")->add_child_text("Don't panic &amp; xml \"is\" 'great' & < > —");
+	BOOST_REQUIRE_EQUAL(dcp::SubtitleAsset::format_xml(doc, {}),
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<Foo>\n"
+"  <Bar>Don't panic &amp;amp; xml \"is\" 'great' &amp; &lt; &gt; —</Bar>\n"
+"</Foo>\n");
+}
diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index 2b8491a3..f1f66bfb 100644
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -257,27 +257,27 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test)
 	c._xml_id = "a6c58cff-3e1e-4b38-acec-a42224475ef6";
 
 	check_xml (
-		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
-		  "<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>"
-		  "<ContentTitleText>Test</ContentTitleText>"
-		  "<IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>"
-		  "<ReelNumber>1</ReelNumber>"
-		  "<Language>en</Language>"
-		  "<EditRate>24 1</EditRate>"
-		  "<TimeCodeRate>24</TimeCodeRate>"
-		  "<SubtitleList>"
-		    "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
-		      "<Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
-		        "<Text Valign=\"top\" Vposition=\"80\">Hello world</Text>"
-		      "</Subtitle>"
-		    "</Font>"
-		    "<Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">"
-		      "<Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">"
-		        "<Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going <Space Size=\"4.2\"/>on</Text>"
-		      "</Subtitle>"
-		    "</Font>"
-		  "</SubtitleList>"
+		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
+		"  <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>\n"
+		"  <ContentTitleText>Test</ContentTitleText>\n"
+		"  <IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>\n"
+		"  <ReelNumber>1</ReelNumber>\n"
+		"  <Language>en</Language>\n"
+		"  <EditRate>24 1</EditRate>\n"
+		"  <TimeCodeRate>24</TimeCodeRate>\n"
+		"  <SubtitleList>\n"
+		"    <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Frutiger\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
+		"      <Subtitle SpotNumber=\"1\" TimeIn=\"00:04:09:22\" TimeOut=\"00:04:11:22\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
+		"        <Text Valign=\"top\" Vposition=\"80\">Hello world</Text>\n"
+		"      </Subtitle>\n"
+		"    </Font>\n"
+		"    <Font AspectAdjust=\"1.0\" Color=\"FF800040\" Effect=\"border\" EffectColor=\"FF010203\" Italic=\"yes\" Script=\"normal\" Size=\"91\" Underline=\"yes\" Weight=\"bold\">\n"
+		"      <Subtitle SpotNumber=\"2\" TimeIn=\"05:41:00:21\" TimeOut=\"06:12:15:21\" FadeUpTime=\"01:02:03:04\" FadeDownTime=\"05:06:07:08\">\n"
+		"        <Text Valign=\"bottom\" Vposition=\"40\" Direction=\"rtl\">What's going <Space Size=\"4.2\"/>on</Text>\n"
+		"      </Subtitle>\n"
+		"    </Font>\n"
+		"  </SubtitleList>\n"
 		"</SubtitleReel>",
 		c.xml_as_string (),
 		vector<string>()
@@ -449,31 +449,23 @@ BOOST_AUTO_TEST_CASE (write_smpte_subtitle_test2)
 
 	check_xml (
 		c.xml_as_string(),
-		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
-		  "<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>"
-		  "<ContentTitleText>Test</ContentTitleText>"
-		  "<IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>"
-		  "<ReelNumber>1</ReelNumber>"
-		  "<Language>en</Language>"
-		  "<EditRate>24 1</EditRate>"
-		  "<TimeCodeRate>24</TimeCodeRate>"
-		  "<SubtitleList>"
-		    "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
-		      "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
-		        "<Text Valign=\"top\" Vposition=\"80\">"
-		          "<Font Italic=\"no\">Testing is </Font>"
-		          "<Font Italic=\"yes\">really</Font>"
-		          "<Font Italic=\"no\"> fun</Font>"
-		        "</Text>"
-		        "<Text Valign=\"top\" Vposition=\"90\">"
-		          "<Font Italic=\"no\">This is the </Font>"
-		          "<Font Italic=\"yes\">second</Font>"
-		          "<Font Italic=\"no\"> line</Font>"
-		        "</Text>"
-		      "</Subtitle>"
-		    "</Font>"
-		  "</SubtitleList>"
+		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
+		"  <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>\n"
+		"  <ContentTitleText>Test</ContentTitleText>\n"
+		"  <IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>\n"
+		"  <ReelNumber>1</ReelNumber>\n"
+		"  <Language>en</Language>\n"
+		"  <EditRate>24 1</EditRate>\n"
+		"  <TimeCodeRate>24</TimeCodeRate>\n"
+		"  <SubtitleList>\n"
+		"    <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
+		"      <Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
+		"        <Text Valign=\"top\" Vposition=\"80\"><Font Italic=\"no\">Testing is </Font><Font Italic=\"yes\">really</Font><Font Italic=\"no\"> fun</Font></Text>\n"
+		"        <Text Valign=\"top\" Vposition=\"90\"><Font Italic=\"no\">This is the </Font><Font Italic=\"yes\">second</Font><Font Italic=\"no\"> line</Font></Text>\n"
+		"      </Subtitle>\n"
+		"    </Font>\n"
+		"  </SubtitleList>\n"
 		"</SubtitleReel>",
 		vector<string>()
 		);
@@ -593,23 +585,23 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_top_alignment)
 
 	check_xml (
 		c.xml_as_string(),
-		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
-		  "<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>"
-		  "<ContentTitleText>Test</ContentTitleText>"
-		  "<IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>"
-		  "<ReelNumber>1</ReelNumber>"
-		  "<Language>en</Language>"
-		  "<EditRate>24 1</EditRate>"
-		  "<TimeCodeRate>24</TimeCodeRate>"
-		  "<SubtitleList>"
-		    "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
-		      "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
-		        "<Text Valign=\"top\" Vposition=\"80\">Top line</Text>"
-		        "<Text Valign=\"top\" Vposition=\"90\">Bottom line</Text>"
-		      "</Subtitle>"
-		    "</Font>"
-		  "</SubtitleList>"
+		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
+		"  <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>\n"
+		"  <ContentTitleText>Test</ContentTitleText>\n"
+		"  <IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>\n"
+		"  <ReelNumber>1</ReelNumber>\n"
+		"  <Language>en</Language>\n"
+		"  <EditRate>24 1</EditRate>\n"
+		"  <TimeCodeRate>24</TimeCodeRate>\n"
+		"  <SubtitleList>\n"
+		"    <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
+		"      <Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
+		"        <Text Valign=\"top\" Vposition=\"80\">Top line</Text>\n"
+		"        <Text Valign=\"top\" Vposition=\"90\">Bottom line</Text>\n"
+		"      </Subtitle>\n"
+		"    </Font>\n"
+		"  </SubtitleList>\n"
 		"</SubtitleReel>",
 		{}
 		);
@@ -679,23 +671,23 @@ BOOST_AUTO_TEST_CASE (write_subtitles_in_vertical_order_with_bottom_alignment)
 
 	check_xml (
 		c.xml_as_string(),
-		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
-		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">"
-		  "<Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>"
-		  "<ContentTitleText>Test</ContentTitleText>"
-		  "<IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>"
-		  "<ReelNumber>1</ReelNumber>"
-		  "<Language>en</Language>"
-		  "<EditRate>24 1</EditRate>"
-		  "<TimeCodeRate>24</TimeCodeRate>"
-		  "<SubtitleList>"
-		    "<Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">"
-		      "<Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">"
-		        "<Text Valign=\"bottom\" Vposition=\"80\">Top line</Text>"
-		        "<Text Valign=\"bottom\" Vposition=\"70\">Bottom line</Text>"
-		      "</Subtitle>"
-		    "</Font>"
-		  "</SubtitleList>"
+		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		"<SubtitleReel xmlns=\"http://www.smpte-ra.org/schemas/428-7/2010/DCST\" xmlns:xs=\"http://www.w3.org/2001/XMLSchema\">\n"
+		"  <Id>urn:uuid:a6c58cff-3e1e-4b38-acec-a42224475ef6</Id>\n"
+		"  <ContentTitleText>Test</ContentTitleText>\n"
+		"  <IssueDate>2016-04-01T03:52:00.000+00:00</IssueDate>\n"
+		"  <ReelNumber>1</ReelNumber>\n"
+		"  <Language>en</Language>\n"
+		"  <EditRate>24 1</EditRate>\n"
+		"  <TimeCodeRate>24</TimeCodeRate>\n"
+		"  <SubtitleList>\n"
+		"    <Font AspectAdjust=\"1.0\" Color=\"FFFFFFFF\" Effect=\"none\" EffectColor=\"FF000000\" ID=\"Arial\" Italic=\"no\" Script=\"normal\" Size=\"48\" Underline=\"no\" Weight=\"normal\">\n"
+		"      <Subtitle SpotNumber=\"1\" TimeIn=\"00:00:01:00\" TimeOut=\"00:00:09:00\" FadeUpTime=\"00:00:00:00\" FadeDownTime=\"00:00:00:00\">\n"
+		"        <Text Valign=\"bottom\" Vposition=\"80\">Top line</Text>\n"
+		"        <Text Valign=\"bottom\" Vposition=\"70\">Bottom line</Text>\n"
+		"      </Subtitle>\n"
+		"    </Font>\n"
+		"  </SubtitleList>\n"
 		"</SubtitleReel>",
 		{}
 		);
diff --git a/test/verify_test.cc b/test/verify_test.cc
index b2e98981..6a3dacc4 100644
--- a/test/verify_test.cc
+++ b/test/verify_test.cc
@@ -1292,7 +1292,7 @@ BOOST_AUTO_TEST_CASE (verify_invalid_closed_caption_xml_size_in_bytes)
 			{
 				dcp::VerificationNote::Type::BV21_ERROR,
 				dcp::VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES,
-				string("372207"),
+				string("419346"),
 				canonical(dir / "subs.mxf")
 			},
 			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
@@ -1332,7 +1332,7 @@ verify_timed_text_asset_too_large (string name)
 	check_verify_result (
 		{ dir },
 		{
-			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695136"), canonical(dir / "subs.mxf") },
+			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, string("121695542"), canonical(dir / "subs.mxf") },
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, string("121634816"), canonical(dir / "subs.mxf") },
 			{ dcp::VerificationNote::Type::BV21_ERROR, dcp::VerificationNote::Code::MISSING_SUBTITLE_START_TIME, canonical(dir / "subs.mxf") },
 			{ dcp::VerificationNote::Type::WARNING, dcp::VerificationNote::Code::INVALID_SUBTITLE_FIRST_TEXT_TIME },
author	Carl Hetherington <cth@carlh.net>	2022-03-20 20:59:28 +0100
committer	Carl Hetherington <cth@carlh.net>	2022-03-20 20:59:28 +0100
commit	2fa6122a3cfa0e801f4a36b39f50e0bf7d575e4b (patch)
tree	b8de41fec71f78debe97ee9fcdd8dc3be65f9b45 /test
parent	ec87fa55c5909ae85429fc5344469cf284e5f6b3 (diff)