X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.cc;h=28dace7afbcf656c8827e3382d8f732fe4c6e65d;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=4e2432463c260565fbe7829344d970e6d935ce7d;hpb=3ce4c624eadab42d740b08d60d52bd0d4f2b86f6;p=dcpomatic.git

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 4e2432463..28dace7af 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -33,6 +33,7 @@ using std::list;
 using std::cout;
 using std::string;
 using std::min;
+using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::function;
@@ -105,9 +106,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 	bool needs_placement = false;
 	optional<int> bottom_line;
 	BOOST_FOREACH (sub::Line i, subtitle.lines) {
-		if (!i.vertical_position.reference || i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
+		if (!i.vertical_position.reference || (i.vertical_position.line && !i.vertical_position.lines) || i.vertical_position.reference.get() == sub::TOP_OF_SUBTITLE) {
 			needs_placement = true;
-			DCPOMATIC_ASSERT (i.vertical_position.line);
 			if (!bottom_line || bottom_line.get() < i.vertical_position.line.get()) {
 				bottom_line = i.vertical_position.line.get();
 			}
@@ -179,15 +179,18 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 			}
 
 			dcp::HAlign h_align;
+			float h_position = i.horizontal_position.proportional;
 			switch (i.horizontal_position.reference) {
 			case sub::LEFT_OF_SCREEN:
 				h_align = dcp::HALIGN_LEFT;
+				h_position = max(h_position, 0.05f);
 				break;
 			case sub::HORIZONTAL_CENTRE_OF_SCREEN:
 				h_align = dcp::HALIGN_CENTER;
 				break;
 			case sub::RIGHT_OF_SCREEN:
 				h_align = dcp::HALIGN_RIGHT;
+				h_position = max(h_position, 0.05f);
 				break;
 			default:
 				h_align = dcp::HALIGN_CENTER;
@@ -211,7 +214,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
 					dcp::Time (from.seconds(), 1000),
 					/* XXX: hmm; this is a bit ugly (we don't know the to time yet) */
 					dcp::Time (),
-					i.horizontal_position.proportional,
+					h_position,
 					h_align,
 					v_position,
 					v_align,