static void
-add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool underline)
+add(std::vector<StringText>& s, std::string text, bool italic, bool bold, bool underline)
{
s.push_back (
StringText (
dcp::HAlign::LEFT,
1,
dcp::VAlign::TOP,
+ 0,
dcp::Direction::LTR,
text,
dcp::Effect::NONE,
0
),
2,
- std::shared_ptr<dcpomatic::Font>()
+ std::shared_ptr<dcpomatic::Font>(),
+ dcp::SubtitleStandard::SMPTE_2014
)
);
}
BOOST_AUTO_TEST_CASE (marked_up_test1)
{
- std::list<StringText> s;
+ std::vector<StringText> s;
add (s, "Hello", false, false, false);
BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
BOOST_AUTO_TEST_CASE (marked_up_test2)
{
- std::list<StringText> s;
+ std::vector<StringText> s;
add (s, "Hello", false, true, false);
BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
BOOST_AUTO_TEST_CASE (marked_up_test3)
{
- std::list<StringText> s;
+ std::vector<StringText> s;
add (s, "Hello", true, true, false);
BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
BOOST_AUTO_TEST_CASE (marked_up_test4)
{
- std::list<StringText> s;
+ std::vector<StringText> s;
add (s, "Hello", true, true, true);
BOOST_CHECK_EQUAL(marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
BOOST_AUTO_TEST_CASE (marked_up_test5)
{
- std::list<StringText> s;
+ std::vector<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=\"41705\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41705\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
BOOST_AUTO_TEST_CASE (marked_up_test6)
{
- std::list<StringText> s;
+ std::vector<StringText> s;
add (s, "Hello", true, false, false);
add (s, " world ", false, false, false);
add (s, "we are bold.", false, true, false);