Basic and slightly inaccurate support for <Space> in subtitles (#2103).

[dcpomatic.git] / test / render_subtitles_test.cc

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index a81ef05bf96c3a3c607c82151abf1113bc8ac84d..5774c8e9af7e111dc4d5140eb68c39fc33627b2f 100644 (file)
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -51,7 +51,8 @@ add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool un
                                dcp::Effect::NONE,
                                dcp::Colour (0, 0, 0),
                                dcp::Time (),
-                               dcp::Time ()
+                               dcp::Time (),
+                               0
                                ),
                        2
                        )
@@ -63,7 +64,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test1)
 {
        std::list<StringText> s;
        add (s, "Hello", false, false, false);
-       BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+       BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 /** Test marked_up() in render_text.cc */
@@ -71,7 +72,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test2)
 {
        std::list<StringText> s;
        add (s, "Hello", false, true, false);
-       BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+       BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 
@@ -80,7 +81,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test3)
 {
        std::list<StringText> s;
        add (s, "Hello", true, true, false);
-       BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+       BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 /** Test marked_up() in render_text.cc */
@@ -88,7 +89,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test4)
 {
        std::list<StringText> s;
        add (s, "Hello", true, true, true);
-       BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+       BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
 }
 
 /** Test marked_up() in render_text.cc */
@@ -97,7 +98,7 @@ BOOST_AUTO_TEST_CASE (render_markup_test5)
        std::list<StringText> s;
        add (s, "Hello", false, true, false);
        add (s, " world.", false, false, false);
-       BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
+       BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
 }
 
 /** Test marked_up() in render_text.cc */
@@ -107,5 +108,5 @@ BOOST_AUTO_TEST_CASE (render_markup_test6)
        add (s, "Hello", true, false, false);
        add (s, " world ", false, false, false);
        add (s, "we are bold.", false, true, false);
-       BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>");
+       BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>");
 }