From 59f07d959514b80fcce5aa99f575ef8e6fceba8b Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 2 Jul 2016 22:20:54 +0100
Subject: Fix thinkos with marked_up() rendering of bold/italic/underline.

---
 src/lib/render_subtitles.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib')

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) {
-- 
cgit v1.2.3