X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frender_subtitles_test.cc;h=e3034def01f209d7bab87914163bbe653d20eed4;hb=HEAD;hp=d1c91260254cfbb623be91628ba33d3cd0931fd0;hpb=e163200eaaf65c63d5105949432140f4084de037;p=dcpomatic.git

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
index d1c912602..e3034def0 100644
--- a/test/render_subtitles_test.cc
+++ b/test/render_subtitles_test.cc
@@ -29,15 +29,17 @@
 #include "lib/image_png.h"
 #include "lib/render_text.h"
 #include "lib/string_text.h"
+#include "test.h"
 #include <dcp/subtitle_string.h>
 #include <boost/test/unit_test.hpp>
 
 
+using std::make_shared;
 using std::shared_ptr;
 
 
 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 (
@@ -62,7 +64,8 @@ add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool un
 				dcp::Colour (0, 0, 0),
 				dcp::Time (),
 				dcp::Time (),
-				0
+				0,
+				std::vector<dcp::Ruby>()
 				),
 			2,
 			std::shared_ptr<dcpomatic::Font>(),
@@ -74,7 +77,7 @@ add (std::list<StringText>& s, std::string text, bool italic, bool bold, bool un
 
 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>");
 }
@@ -82,7 +85,7 @@ BOOST_AUTO_TEST_CASE (marked_up_test1)
 
 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>");
 }
@@ -90,21 +93,21 @@ BOOST_AUTO_TEST_CASE (marked_up_test2)
 
 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>");
@@ -112,7 +115,7 @@ BOOST_AUTO_TEST_CASE (marked_up_test5)
 
 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);
@@ -120,6 +123,56 @@ BOOST_AUTO_TEST_CASE (marked_up_test6)
 }
 
 
+BOOST_AUTO_TEST_CASE(render_text_with_newline_test)
+{
+	std::list<dcp::SubtitleString> ss = {
+		{
+			{}, true, false, false, dcp::Colour(255, 255, 255), 42, 1.0,
+			dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24),
+			0.5, dcp::HAlign::CENTER,
+			0.5, dcp::VAlign::CENTER,
+			0.0,
+			dcp::Direction::LTR,
+			"Hello                     world",
+			dcp::Effect::NONE, dcp::Colour(0, 0, 0),
+			{}, {},
+			0,
+			std::vector<dcp::Ruby>()
+		},
+		{
+			{}, true, false, false, dcp::Colour(255, 255, 255), 42, 1.0,
+			dcp::Time(0, 0, 0, 0, 24), dcp::Time(0, 0, 1, 0, 24),
+			0.5, dcp::HAlign::CENTER,
+			0.5, dcp::VAlign::CENTER,
+			0.0,
+			dcp::Direction::LTR,
+			"\n",
+			dcp::Effect::NONE, dcp::Colour(0, 0, 0),
+			{}, {},
+			0,
+			std::vector<dcp::Ruby>()
+		}
+	};
+
+	std::vector<StringText> st;
+	for (auto i: ss) {
+		st.push_back({i, 0, make_shared<dcpomatic::Font>("foo"), dcp::SubtitleStandard::SMPTE_2014});
+	}
+
+	auto images = render_text(st, dcp::Size(1998, 1080), {}, 24);
+
+	BOOST_CHECK_EQUAL(images.size(), 1U);
+	image_as_png(Image::ensure_alignment(images.front().image, Image::Alignment::PADDED)).write("build/test/render_text_with_newline_test.png");
+#if defined(DCPOMATIC_OSX)
+	check_image("test/data/mac/render_text_with_newline_test.png", "build/test/render_text_with_newline_test.png");
+#elif defined(DCPOMATIC_WINDOWS)
+	check_image("test/data/windows/render_text_with_newline_test.png", "build/test/render_text_with_newline_test.png");
+#else
+	check_image("test/data/render_text_with_newline_test.png", "build/test/render_text_with_newline_test.png");
+#endif
+}
+
+
 #if 0
 
 BOOST_AUTO_TEST_CASE (render_text_test)