#include <sub/subtitle.h>
#include <boost/shared_ptr.hpp>
#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
#include <iostream>
using std::list;
void
SubtitleDecoder::give_text (ContentTimePeriod period, list<dcp::SubtitleString> s)
{
+ /* We must escape < and > in strings, otherwise they might confuse our subtitle
+ renderer (which uses some HTML-esque markup to do bold/italic etc.)
+ */
+ BOOST_FOREACH (dcp::SubtitleString& i, s) {
+ string t = i.text ();
+ boost::algorithm::replace_all (t, "<", "<");
+ boost::algorithm::replace_all (t, ">", ">");
+ i.set_text (t);
+ }
+
_decoded_text.push_back (ContentTextSubtitle (period, s));
}
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "lib/ratio.h"
#include "lib/dcp_decoder.h"
#include "lib/dcp_content_type.h"
+#include "lib/dcp_subtitle_decoder.h"
#include "lib/subtitle_content.h"
#include "lib/content_subtitle.h"
#include "lib/subtitle_decoder.h"
BOOST_CHECK_EQUAL (subs.front().subs.front().text(), "Noch mal.");
BOOST_CHECK_EQUAL (subs.front().subs.back().text(), "Encore une fois.");
}
+
+/** Test subtitles whose text includes things like <b> */
+BOOST_AUTO_TEST_CASE (dcp_subtitle_test2)
+{
+ shared_ptr<Film> film = new_test_film ("dcp_subtitle_test2");
+ film->set_container (Ratio::from_id ("185"));
+ film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
+ film->set_name ("frobozz");
+ shared_ptr<DCPSubtitleContent> content (new DCPSubtitleContent (film, "test/data/dcp_sub2.xml"));
+ film->examine_and_add_content (content);
+ wait_for_jobs ();
+
+ shared_ptr<DCPSubtitleDecoder> decoder (new DCPSubtitleDecoder (content));
+ list<ContentTextSubtitle> sub = decoder->subtitle->get_text (
+ ContentTimePeriod (ContentTime::from_seconds(0), ContentTime::from_seconds(2)), true, true
+ );
+ BOOST_REQUIRE_EQUAL (sub.size(), 1);
+ BOOST_REQUIRE_EQUAL (sub.front().subs.size(), 1);
+ BOOST_CHECK_EQUAL (sub.front().subs.front().text(), "<b>Hello world!</b>");
+}