-2018-05-18 Carl Hetherington <cth@carlh.net>
+2018-05-15 Carl Hetherington <cth@carlh.net>
+
+ * Fix missing burnt-in / previewed subtitles containing ampersands.
* Fix slow exports from DCP content (#1285).
2018-05-15 Carl Hetherington <cth@carlh.net>
- * Fix incorrect subtitle positining in a VF when there are more than
+ * Fix incorrect subtitle positioning in a VF when there are more than
two consecutive reels with no subtitles.
+2018-05-15 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.12.5 released.
+
2018-05-08 Carl Hetherington <cth@carlh.net>
* Look at subtitle colour and effect when deciding whether or not to
#include <pango/pangocairo.h>
#endif
#include <boost/foreach.hpp>
+#include <boost/algorithm/string.hpp>
#include <iostream>
using std::list;
using std::make_pair;
using boost::shared_ptr;
using boost::optional;
+using boost::algorithm::replace_all;
static FcConfig* fc_config = 0;
static list<pair<FontFiles, string> > fc_config_fonts;
/* Between 1-65535 inclusive, apparently... */
out += "alpha=\"" + dcp::raw_convert<string>(int(floor(fade_factor * 65534)) + 1) + "\" ";
out += "color=\"#" + i.colour().to_rgb_string() + "\">";
- out += i.text ();
+
+ string t = i.text();
+ replace_all(t, "&", "&");
+ out += t;
+
out += "</span>";
}