diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/render_text.cc | 5 | ||||
| -rw-r--r-- | src/lib/text_decoder.cc | 18 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index d3db4ac19..2338bde97 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -103,6 +103,11 @@ marked_up (list<StringText> subtitles, int target_height, float fade_factor, str span += " " + extra_attribute; } span += ">"; + + boost::algorithm::replace_all(text, "&", "&"); + boost::algorithm::replace_all(text, "<", "<"); + boost::algorithm::replace_all(text, ">", ">"); + span += text; span += "</span>"; return span; diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 4b521ede7..750deb9b3 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -66,20 +66,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, "<", "<"); - boost::algorithm::replace_all(text, ">", ">"); - return text; -} - - -static void set_forced_appearance(shared_ptr<const TextContent> content, StringText& subtitle) { @@ -113,7 +99,7 @@ TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> sub 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); } @@ -257,7 +243,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & sub_subti 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(), /* Hack: we should use subtitle.fade_up and subtitle.fade_down here |