Support \pos in ssa.

1 files changed, 88 insertions, 51 deletions

diff --git a/test/ssa_reader_test.cc b/test/ssa_reader_test.cc
index bf7b7a8..b127a86 100644
--- a/test/ssa_reader_test.cc
+++ b/test/ssa_reader_test.cc
@@ -77,7 +77,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test)
 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> r = sub::SSAReader::parse_line (
+		base,
+		"This is a line with some {\\i1}italics{\\i0} and then\\nthere is a new line.",
+		1920, 1080
+		);
 
 	list<sub::RawSubtitle>::const_iterator i = r.begin ();
 	BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
@@ -103,7 +107,11 @@ BOOST_AUTO_TEST_CASE (ssa_reader_line_test1)
 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> r = sub::SSAReader::parse_line (
+		base,
+		"{\\i1}It's all just italics{\\i0}",
+		1920, 1080
+		);
 
 	list<sub::RawSubtitle>::const_iterator i = r.begin ();
 	BOOST_CHECK_EQUAL (i->text, "It's all just italics");
@@ -111,7 +119,12 @@ BOOST_AUTO_TEST_CASE (ssa_reader_line_test2)
 	++i;
 	BOOST_REQUIRE (i == r.end ());
 
-	r = sub::SSAReader::parse_line (base, "{\\i1}Italic{\\i0}\\Nand new line");
+	r = sub::SSAReader::parse_line (
+		base,
+		"{\\i1}Italic{\\i0}\\Nand new line",
+		1920, 1080
+		);
+
 	i = r.begin ();
 	BOOST_CHECK_EQUAL (i->text, "Italic");
 	BOOST_CHECK_EQUAL (i->italic, true);
@@ -145,12 +158,14 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test2)
 	BOOST_CHECK_EQUAL (i->to, t); \
 	j = i->lines.begin ();
 
-#define LINE(p, r)							\
+#define LINE(vp, vr, hp, hr)		      \
 	BOOST_REQUIRE (j != i->lines.end ()); \
 	BOOST_CHECK (j->vertical_position.proportional); \
-	BOOST_CHECK (fabs (j->vertical_position.proportional.get() - p) < 1e-5); \
+	BOOST_CHECK (fabs (j->vertical_position.proportional.get() - vp) < 1e-5); \
 	BOOST_CHECK (j->vertical_position.reference); \
-	BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), r); \
+	BOOST_CHECK_EQUAL (j->vertical_position.reference.get(), vr); \
+	BOOST_CHECK (fabs (j->horizontal_position.proportional - hp) < 1e-5); \
+	BOOST_CHECK_EQUAL (j->horizontal_position.reference, hr); \
 	k = j->blocks.begin (); \
 	++j;
 
@@ -182,7 +197,7 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test3)
 
 	/* Hello world */
 	SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Hello world", "Arial", 20, false, false, false);
 	SUB_END();
 
@@ -192,15 +207,15 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test3)
 	   points, 1.2 times spaced, as a proportion of the total
 	   screen height 729 points) up.
 	*/
-	LINE((900.0 / 1080) - (20.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE((900.0 / 1080) - (20.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("This is vertically moved", "Arial", 20, false, false, false);
-	LINE((900.0 / 1080), sub::BOTTOM_OF_SCREEN);
+	LINE((900.0 / 1080), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("and has two lines.", "Arial", 20, false, false, false);
 	SUB_END();
 
 	/* Some {\i1}italics{\i} are here. */
 	SUB_START (sub::Time::from_hms (0, 0, 7, 740), sub::Time::from_hms (0, 0, 9, 0));
-	LINE(0, sub::BOTTOM_OF_SCREEN);
+	LINE(0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("Some ", "Arial", 20, false, false, false);
 	BLOCK("italics", "Arial", 20, false, true, false);
 	BLOCK(" are here.", "Arial", 20, false, false, false);
@@ -209,47 +224,47 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test3)
 	/* Alignments */
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 230), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("bottom left", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 240), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("bottom centre", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 250), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("bottom right", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 260), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN);
+	LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("middle left", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 270), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN);
+	LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("middle centre", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 280), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN);
+	LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("middle right", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 290), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::TOP_OF_SCREEN);
+	LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("top left", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 300), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::TOP_OF_SCREEN);
+	LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("top centre", "Arial", 20, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 9, 310), sub::Time::from_hms (0, 0, 11, 560));
-	LINE (0, sub::TOP_OF_SCREEN);
+	LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK("top right", "Arial", 20, false, false, false);
 	SUB_END ();
 
@@ -276,30 +291,30 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test4)
 	   spaced, as a proportion of the total screen height 729
 	   points) up.
 	*/
-	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("1st line: This is normal", "Verdana", 50, false, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2d line: this is bold", "Verdana", 50, true, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 3, 100), sub::Time::from_hms (0, 0, 5, 100));
-	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("1st line: this is bold", "Verdana", 50, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2nd line: This is normal", "Verdana", 50, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 5, 200), sub::Time::from_hms (0, 0, 7, 200));
-	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("1st line: this is bold", "Verdana", 50, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2nd line: this is italics", "Verdana", 50, false, true, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 7, 300), sub::Time::from_hms (0, 0, 9, 300));
-	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((50.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("1st line: this is italics", "Verdana", 50, false, true, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2nd line: this is bold", "Verdana", 50, true, false, false);
 	SUB_END ();
 }
@@ -324,30 +339,30 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test5)
 	   spaced, as a proportion of the total screen height 729
 	   points) up.
 	*/
-	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("1st subtitle, 1st line", "arial", 26, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2nd subtitle, 2nd line", "arial", 26, true, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 3, 100), sub::Time::from_hms (0, 0, 5, 100));
-	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2nd subtitle, 1st line", "arial", 26, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("2nd subtitle, 2nd line", "arial", 26, true, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 5, 200), sub::Time::from_hms (0, 0, 7, 200));
-	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("3rd subtitle, 1st line", "arial", 26, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("3rd subtitle, 2nd line", "arial", 26, true, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 7, 300), sub::Time::from_hms (0, 0, 9, 300));
-	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((26.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("4th subtitle, 1st line", "arial", 26, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("4th subtitle, 2nd line", "arial", 26, true, false, false);
 	SUB_END ();
 }
@@ -373,63 +388,85 @@ BOOST_AUTO_TEST_CASE (ssa_reader_test6)
 	   spaced, as a proportion of the total screen height 729
 	   points) up.
 	*/
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is normal", "Arial", 30, false, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is bold", "Arial", 30, true, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 1, 200), sub::Time::from_hms (0, 0, 2, 240));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is bold", "Arial", 30, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is normal", "Arial", 30, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 2, 300), sub::Time::from_hms (0, 0, 3, 380));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is bold", "Arial", 30, true, false, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is italic", "Arial", 30, false, true, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 3, 400), sub::Time::from_hms (0, 0, 4, 480));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is italic", "Arial", 30, false, true, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is bold", "Arial", 30, true, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 4, 510), sub::Time::from_hms (0, 0, 5, 600));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Last three words are ", "Arial", 30, false, false, false);
 	BLOCK ("bold AND italic", "Arial", 30, true, true, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Last three words are ", "Arial", 30, false, false, false);
 	BLOCK ("italic AND bold", "Arial", 30, true, true, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 5, 620), sub::Time::from_hms (0, 0, 6, 710));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Last three words are ", "Arial", 30, false, false, false);
 	BLOCK ("bold AND italic", "Arial", 30, true, true, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("First three words", "Arial", 30, true, true, false);
 	BLOCK (" are italic AND bold", "Arial", 30, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 6, 730), sub::Time::from_hms (0, 0, 8, 30));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Last three words are ", "Arial", 30, false, false, false);
 	BLOCK ("bold AND italic", "Arial", 30, true, true, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("This line is normal", "Arial", 30, false, false, false);
 	SUB_END ();
 
 	SUB_START (sub::Time::from_hms (0, 0, 8, 90), sub::Time::from_hms (0, 0, 9, 210));
-	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN);
+	LINE ((30.0 * 1.2 / 792), sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Both lines are bold AND italic", "Arial", 30, true, true, false);
-	LINE (0, sub::BOTTOM_OF_SCREEN);
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
 	BLOCK ("Both lines are bold AND italic", "Arial", 30, true, true, false);
 	SUB_END ();
 }
+
+/** Test \pos */
+BOOST_AUTO_TEST_CASE (ssa_reader_line_pos)
+{
+	boost::filesystem::path p = "test/data/test2.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 ());
+
+	list<sub::Subtitle>::iterator i = subs.begin ();
+	list<sub::Line>::iterator j;
+	list<sub::Block>::iterator k;
+
+	/* Hello world */
+	SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
+	LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+	BLOCK ("Hello world this is ", "Arial", 20, false, false, false);
+	LINE (300.0 / 1080, sub::TOP_OF_SCREEN, 400.0 / 1920, sub::LEFT_OF_SCREEN);
+	BLOCK ("positioning.", "Arial", 20, false, false, false);
+	SUB_END();
+}