summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-07-02 22:20:54 +0100
committerCarl Hetherington <cth@carlh.net>2016-07-02 22:20:54 +0100
commit59f07d959514b80fcce5aa99f575ef8e6fceba8b (patch)
treecb99bbe0c8fe9241c20a378085b03a6a046773ab /src
parent066e772c9ef7e6d08326a04a351514374e3d40e7 (diff)
Fix thinkos with marked_up() rendering of bold/italic/underline.
Diffstat (limited to 'src')
-rw-r--r--src/lib/render_subtitles.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index fea788a5c..782d06532 100644
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -52,6 +52,7 @@ marked_up (list<dcp::SubtitleString> subtitles)
bool bold = false;
bool underline = false;
BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
+
if (i.italic() && !italic) {
out += "<i>";
}
@@ -61,9 +62,6 @@ marked_up (list<dcp::SubtitleString> subtitles)
if (i.underline() && !underline) {
out += "<u>";
}
-
- out += i.text ();
-
if (!i.underline() && underline) {
out += "</u>";
}
@@ -77,6 +75,8 @@ marked_up (list<dcp::SubtitleString> subtitles)
italic = i.italic ();
bold = i.bold ();
underline = i.underline ();
+
+ out += i.text ();
}
if (underline) {