diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-08-22 15:00:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-08-22 15:00:33 +0100 |
| commit | 8b8bce8d2a83739f96e02a48b77d352414361c43 (patch) | |
| tree | 08abcadb9fa0ba92a6e75d6f6a21383341ba656f /test | |
| parent | a3bbf59dd06dda14f070e99aaee32bb29a13f51a (diff) | |
Allow <Font> nodes inside <Subtitle> nodes.
Diffstat (limited to 'test')
| -rw-r--r-- | test/ref/subs.xml | 4 | ||||
| -rw-r--r-- | test/tests.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/ref/subs.xml b/test/ref/subs.xml index 399c2a57..515dd9f7 100644 --- a/test/ref/subs.xml +++ b/test/ref/subs.xml @@ -12,7 +12,9 @@ <Font Italic="yes"> <Subtitle SpotNumber="2" TimeIn="00:00:07:177" TimeOut="00:00:11:031" FadeUpTime="1" FadeDownTime="1"> <Text VAlign="bottom" VPosition="21.0">My corset was H.M. The Queen's</Text> - <Text VAlign="bottom" VPosition="15.0">My large wonderbra</Text> + <Font Italic="no"> + <Text VAlign="bottom" VPosition="15.0">My large wonderbra</Text> + </Font> </Subtitle> </Font> <Subtitle SpotNumber="3" TimeIn="00:00:11:094" TimeOut="00:00:13:063" FadeUpTime="1" FadeDownTime="1"> diff --git a/test/tests.cc b/test/tests.cc index d434429a..3264f07d 100644 --- a/test/tests.cc +++ b/test/tests.cc @@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE (subtitles) BOOST_CHECK_EQUAL (s.back()->in(), libdcp::Time (0, 0, 7, 177)); BOOST_CHECK_EQUAL (s.back()->out(), libdcp::Time (0, 0, 11, 31)); BOOST_CHECK_EQUAL (s.back()->font(), "Arial"); - BOOST_CHECK_EQUAL (s.back()->italic(), true); + BOOST_CHECK_EQUAL (s.back()->italic(), false); BOOST_CHECK_EQUAL (s.back()->color(), libdcp::Color(255, 255, 255)); BOOST_CHECK_EQUAL (s.back()->size_in_pixels(1080), 53); BOOST_CHECK_EQUAL (s.back()->effect(), libdcp::BORDER); |