X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.cc;h=6fd036ae191ad193b5f1813e8eba8c5219e4949f;hb=37d2bf172e9061f24c874d5416bd3c8f9719c823;hp=930262a74da321fa22ac2df75bd2127c46592608;hpb=9726a58f44d52d235b027225ddd68c6acf83c733;p=dcpomatic.git

diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index 930262a74..6fd036ae1 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -65,20 +65,6 @@ TextDecoder::emit_bitmap_start (ContentBitmapText const& bitmap)
 }
 
 
-static
-string
-escape_text (string text)
-{
-	/* We must escape some things, otherwise they might confuse our subtitle
-	   renderer (which uses entities and some HTML-esque markup to do bold/italic etc.)
-	*/
-	boost::algorithm::replace_all(text, "&", "&");
-	boost::algorithm::replace_all(text, "<", "&lt;");
-	boost::algorithm::replace_all(text, ">", "&gt;");
-	return text;
-}
-
-
 static
 void
 set_forced_appearance(shared_ptr<const TextContent> content, StringText& subtitle)
@@ -110,10 +96,10 @@ TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> sub
 		auto string_text = StringText(
 			subtitle,
 			content()->outline_width(),
-			subtitle.font() ? content()->get_font(*subtitle.font()) : shared_ptr<Font>(),
+			content()->get_font(subtitle.font().get_value_or("")),
 			valign_standard
 			);
-		string_text.set_text(escape_text(string_text.text()));
+		string_text.set_text(string_text.text());
 		set_forced_appearance(content(), string_text);
 		string_texts.push_back(string_text);
 	}
@@ -167,10 +153,10 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
 				switch (line.vertical_position.reference.get_value_or(sub::BOTTOM_OF_SCREEN)) {
 				case sub::BOTTOM_OF_SCREEN:
 				case sub::TOP_OF_SUBTITLE:
-					/* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
+					/* This 0.9 is an arbitrary value to lift the bottom sub off the bottom
 					   of the screen a bit to a pleasing degree.
 					   */
-					v_position = 1.015 -
+					v_position = 0.9 -
 						(1 + bottom_line.get() - line.vertical_position.line.get()) * multiplier;
 
 					v_align = dcp::VAlign::TOP;
@@ -240,12 +226,16 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
 			   content by the other emit_plain_start() above.
 			*/
 
+			auto dcp_colour = [](sub::Colour const& c) {
+				return dcp::Colour(lrintf(c.r * 255), lrintf(c.g * 255), lrintf(c.b * 255));
+				};
+
 			auto dcp_subtitle = dcp::SubtitleString(
 				optional<string>(),
 				block.italic,
 				block.bold,
 				block.underline,
-				block.colour.dcp(),
+				dcp_colour(block.colour),
 				block.font_size.points (72 * 11),
 				1.0,
 				dcp::Time (from.seconds(), 1000),
@@ -255,10 +245,11 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti
 				h_align,
 				v_position,
 				v_align,
+				0,
 				dcp::Direction::LTR,
-				escape_text(block.text),
+				block.text,
 				dcp::Effect::NONE,
-				block.effect_colour.get_value_or(sub::Colour(0, 0, 0)).dcp(),
+				dcp_colour(block.effect_colour.get_value_or(sub::Colour(0, 0, 0))),
 				/* Hack: we should use subtitle.fade_up and subtitle.fade_down here
 				   but the times of these often don't have a frame rate associated
 				   with them so the sub::Time won't convert them to milliseconds without