Hacks.libssa

2 files changed, 55 insertions, 40 deletions

diff --git a/test/data/test.ssa b/test/data/test.ssa
new file mode 100644
index 0000000..578c3d4
--- /dev/null
+++ b/test/data/test.ssa
@@ -0,0 +1,20 @@
+[Script Info]
+Title: libsub test
+ScriptType: v4.00
+WrapStyle: 0
+ScaledBorderAndShadow: yes
+PlayResX: 1920
+PlayResY: 1080
+
+[V4 Styles]
+Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, TertiaryColour, BackColour, Bold, Italic, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, AlphaLevel, Encoding
+Style: Default,Arial,20,16777215,255,0,0,0,0,1,2,2,2,10,10,10,0,1
+
+[Fonts]
+
+[Graphics]
+
+[Events]
+Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+Dialogue: Marked=0,0:00:01.23,0:00:04.55,Default,,0,0,0,,Hello world
+Dialogue: Marked=0,0:00:05.74,0:00:11.00,Default,,0,0,900,,This is vertically moved
diff --git a/test/ssa_reader_test.cc b/test/ssa_reader_test.cc
index 76043a7..9a6dd56 100644
--- a/test/ssa_reader_test.cc
+++ b/test/ssa_reader_test.cc
@@ -42,11 +42,13 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test)
 	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 2, 41, 790));
 	list<sub::Line>::iterator j = i->lines.begin();
 	BOOST_REQUIRE (j != i->lines.end ());
+	BOOST_CHECK_EQUAL (j->vertical_position.proportional.get(), 0);
+	BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), sub::BOTTOM_OF_SCREEN);
 	BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
 	sub::Block b = j->blocks.front ();
 	BOOST_CHECK_EQUAL (b.text, "Et les enregistrements de ses ondes delta ?");
 	BOOST_CHECK_EQUAL (b.font.get(), "Wolf_Rain");
-	BOOST_CHECK_EQUAL (b.font_size.points().get(), 56);
+	BOOST_CHECK_EQUAL (b.font_size.proportional().get(), 56.0 / 1024);
 	BOOST_CHECK_EQUAL (b.bold, false);
 	BOOST_CHECK_EQUAL (b.italic, false);
 	BOOST_CHECK_EQUAL (b.underline, false);
@@ -61,7 +63,7 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test)
 	b = j->blocks.front ();
 	BOOST_CHECK_EQUAL (b.text, "Toujours rien.");
 	BOOST_CHECK_EQUAL (b.font.get(), "Wolf_Rain");
-	BOOST_CHECK_EQUAL (b.font_size.points().get(), 56);
+	BOOST_CHECK_EQUAL (b.font_size.proportional().get(), 56.0 / 1024);
 	BOOST_CHECK_EQUAL (b.bold, false);
 	BOOST_CHECK_EQUAL (b.italic, false);
 	BOOST_CHECK_EQUAL (b.underline, false);
@@ -70,44 +72,6 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test)
 	BOOST_CHECK (i == subs.end());
 }
 
-BOOST_AUTO_TEST_CASE (ssa_reader_line_test1)
-{
-	sub::RawSubtitle base;
-	list<sub::RawSubtitle> r = sub::SSAReader::parse_line (base, "This is a line with some {i1}italics{i0} and then\\nthere is a new line.");
-
-	list<sub::RawSubtitle>::const_iterator i = r.begin ();
-	BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
-	BOOST_CHECK_EQUAL (i->italic, false);
-	++i;
-	BOOST_REQUIRE (i != r.end ());
-
-	BOOST_CHECK_EQUAL (i->text, "italics");
-	BOOST_CHECK_EQUAL (i->italic, true);
-	++i;
-	BOOST_REQUIRE (i != r.end ());
-
-	BOOST_CHECK_EQUAL (i->text, " and then");
-	BOOST_CHECK_EQUAL (i->italic, false);
-	++i;
-	BOOST_REQUIRE (i != r.end ());
-
-	BOOST_CHECK_EQUAL (i->text, "there is a new line.");
-	++i;
-	BOOST_REQUIRE (i == r.end ());
-}
-
-BOOST_AUTO_TEST_CASE (ssa_reader_line_test2)
-{
-	sub::RawSubtitle base;
-	list<sub::RawSubtitle> r = sub::SSAReader::parse_line (base, "{i1}It's all just italics{i0}");
-
-	list<sub::RawSubtitle>::const_iterator i = r.begin ();
-	BOOST_CHECK_EQUAL (i->text, "It's all just italics");
-	BOOST_CHECK_EQUAL (i->italic, true);
-	++i;
-	BOOST_REQUIRE (i == r.end ());
-}
-
 static void
 test (boost::filesystem::path p)
 {
@@ -123,3 +87,34 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test2)
 {
 	test ("DKH_UT_EN20160601def.ssa");
 }
+
+/** Test a file with some bits to exercise the parser */
+BOOST_AUTO_TEST_CASE (ssa_reader_test3)
+{
+	boost::filesystem::path p = "test/data/test.ssa";
+	FILE* f = fopen (p.string().c_str(), "r");
+	sub::SSAReader reader (f);
+	fclose (f);
+	list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+
+	BOOST_REQUIRE_EQUAL (subs.size(), 2);
+
+	list<sub::Subtitle>::const_iterator i = subs.begin ();
+	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 1, 230));
+	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 4, 550));
+	BOOST_REQUIRE_EQUAL (i->lines.size(), 1);
+	list<sub::Line>::const_iterator j = i->lines.begin();
+	BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
+	sub::Block b = j->blocks.front ();
+	BOOST_CHECK_EQUAL (b.text, "Hello world");
+	++i;
+
+	BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 5, 740));
+	BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 11, 0));
+	BOOST_REQUIRE_EQUAL (i->lines.size(), 1);
+	j = i->lines.begin();
+	BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
+	b = j->blocks.front ();
+	BOOST_CHECK_EQUAL (b.text, "This is vertically moved");
+	++i;
+}