Basic HAlign / HPosition support.

3 files changed, 77 insertions, 27 deletions

diff --git a/test/read_subtitle_test.cc b/test/read_subtitle_test.cc
index 6ee59612..42bd2ee4 100644
--- a/test/read_subtitle_test.cc
+++ b/test/read_subtitle_test.cc
@@ -42,8 +42,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 				   1.0,
 				   dcp::Time (0, 0, 5, 198, 250),
 				   dcp::Time (0, 0, 7, 115, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.15,
-				   dcp::BOTTOM,
+				   dcp::VALIGN_BOTTOM,
 				   "My jacket was Idi Amin's",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -61,8 +63,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 				   1.0,
 				   dcp::Time (0, 0, 7, 177, 250),
 				   dcp::Time (0, 0, 11, 31, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.21,
-				   dcp::BOTTOM,
+				   dcp::VALIGN_BOTTOM,
 				   "My corset was H.M. The Queen's",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -77,8 +81,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 				   1.0,
 				   dcp::Time (0, 0, 7, 177, 250),
 				   dcp::Time (0, 0, 11, 31, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.15,
-				   dcp::BOTTOM,
+				   dcp::VALIGN_BOTTOM,
 				   "My large wonderbra",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -96,8 +102,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 				   1.0,
 				   dcp::Time (0, 0, 11, 94, 250),
 				   dcp::Time (0, 0, 13, 63, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.15,
-				   dcp::BOTTOM,
+				   dcp::VALIGN_BOTTOM,
 				   "Once belonged to the Shah",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -115,8 +123,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test1)
 				   1.0,
 				   dcp::Time (0, 0, 13, 104, 250),
 				   dcp::Time (0, 0, 15, 177, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.15,
-				   dcp::BOTTOM,
+				   dcp::VALIGN_BOTTOM,
 				   "And these are Roy Hattersley's jeans",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -140,8 +150,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 0, 41, 62, 250),
 				   dcp::Time (0, 0, 43, 52, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "At afternoon tea with John Peel",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -156,8 +168,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 0, 41, 62, 250),
 				   dcp::Time (0, 0, 43, 52, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "I enquired if his accent was real",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -175,8 +189,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 0, 50, 42, 250),
 				   dcp::Time (0, 0, 52, 21, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "He said \"out of the house",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -191,8 +207,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 0, 50, 42, 250),
 				   dcp::Time (0, 0, 52, 21, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "I'm incredibly scouse",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -210,8 +228,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 2, 208, 250),
 				   dcp::Time (0, 1, 4, 10, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "At home it depends how I feel.\"",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -226,8 +246,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 2, 208, 250),
 				   dcp::Time (0, 1, 4, 10, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "I spent a long weekend in Brighton",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -245,8 +267,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 15, 42, 250),
 				   dcp::Time (0, 1, 16, 42, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "With the legendary Miss Enid Blyton",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -261,8 +285,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 15, 42, 250),
 				   dcp::Time (0, 1, 16, 42, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "She said \"you be Noddy",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -280,8 +306,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 27, 115, 250),
 				   dcp::Time (0, 1, 28, 208, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "That curious creature the Sphinx",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -296,8 +324,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 27, 115, 250),
 				   dcp::Time (0, 1, 28, 208, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "Is smarter than anyone thinks",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -315,8 +345,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 42, 229, 250),
 				   dcp::Time (0, 1, 45, 62, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "It sits there and smirks",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -331,8 +363,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 42, 229, 250),
 				   dcp::Time (0, 1, 45, 62, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "And you don't think it works",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -350,8 +384,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 45, 146, 250),
 				   dcp::Time (0, 1, 47, 94, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "Then when you're not looking, it winks.",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -366,8 +402,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 45, 146, 250),
 				   dcp::Time (0, 1, 47, 94, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "When it snows you will find Sister Sledge",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -385,8 +423,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 47, 146, 250),
 				   dcp::Time (0, 1, 48, 167, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "Out mooning, at night, on the ledge",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -401,8 +441,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 1, 47, 146, 250),
 				   dcp::Time (0, 1, 48, 167, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "One storey down",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -420,8 +462,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 2, 5, 208, 250),
 				   dcp::Time (0, 2, 7, 31, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.89,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "HELLO",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
@@ -436,8 +480,10 @@ BOOST_AUTO_TEST_CASE (read_subtitle_test2)
 				   1.0,
 				   dcp::Time (0, 2, 5, 208, 250),
 				   dcp::Time (0, 2, 7, 31, 250),
+				   0,
+				   dcp::HALIGN_CENTER,
 				   0.95,
-				   dcp::TOP,
+				   dcp::VALIGN_TOP,
 				   "WORLD",
 				   dcp::BORDER,
 				   dcp::Colour (0, 0, 0),
diff --git a/test/text_test.cc b/test/text_test.cc
index 8aff4f1d..a9723bb1 100644
--- a/test/text_test.cc
+++ b/test/text_test.cc
@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE (text_test1)
 
 	dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250);
 	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
-	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
+	BOOST_CHECK_EQUAL (t.v_align, dcp::VALIGN_TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");
 }
 
@@ -48,6 +48,6 @@ BOOST_AUTO_TEST_CASE (text_test2)
 
 	dcp::TextNode t (cxml::NodePtr (new cxml::Node (text)), 250);
 	BOOST_CHECK_CLOSE (t.v_position, 0.042, 0.001);
-	BOOST_CHECK_EQUAL (t.v_align, dcp::TOP);
+	BOOST_CHECK_EQUAL (t.v_align, dcp::VALIGN_TOP);
 	BOOST_CHECK_EQUAL (t.text, "Hello world");
 }
diff --git a/test/write_subtitle_test.cc b/test/write_subtitle_test.cc
index a017547b..1a6f96bd 100644
--- a/test/write_subtitle_test.cc
+++ b/test/write_subtitle_test.cc
@@ -40,8 +40,10 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
 			1.0,
 			dcp::Time (0, 4,  9, 22, 24),
 			dcp::Time (0, 4, 11, 22, 24),
+			0,
+			dcp::HALIGN_CENTER,
 			0.8,
-			dcp::TOP,
+			dcp::VALIGN_TOP,
 			"Hello world",
 			dcp::NONE,
 			dcp::Colour (0, 0, 0),
@@ -59,8 +61,10 @@ BOOST_AUTO_TEST_CASE (write_subtitle_test)
 			1.0,
 			dcp::Time (5, 41,  0, 21, 24),
 			dcp::Time (6, 12, 15, 21, 24),
+			0,
+			dcp::HALIGN_CENTER,
 			0.4,
-			dcp::BOTTOM,
+			dcp::VALIGN_BOTTOM,
 			"What's going on",
 			dcp::BORDER,
 			dcp::Colour (1, 2, 3),