Fix pango markup when rendering subtitles.

diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index 0e985371c050317e8cfe4f62ca5697b4a293cf27..fea788a5cc1b8e833fd48a66847ead2971dacb25 100644 (file)
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -44,6 +44,54 @@ using boost::optional;
 static FcConfig* fc_config = 0;
 static list<pair<FontFiles, string> > fc_config_fonts;
 
+string
+marked_up (list<dcp::SubtitleString> subtitles)
+{
+       string out;
+       bool italic = false;
+       bool bold = false;
+       bool underline = false;
+       BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
+               if (i.italic() && !italic) {
+                       out += "<i>";
+               }
+               if (i.bold() && !bold) {
+                       out += "<b>";
+               }
+               if (i.underline() && !underline) {
+                       out += "<u>";
+               }
+
+               out += i.text ();
+
+               if (!i.underline() && underline) {
+                       out += "</u>";
+               }
+               if (!i.bold() && bold) {
+                       out += "</b>";
+               }
+               if (!i.italic() && italic) {
+                       out += "</i>";
+               }
+
+               italic = i.italic ();
+               bold = i.bold ();
+               underline = i.underline ();
+       }
+
+       if (underline) {
+               out += "</u>";
+       }
+       if (bold) {
+               out += "</b>";
+       }
+       if (italic) {
+               out += "</i>";
+       }
+
+       return out;
+}
+
 /** @param subtitles A list of subtitles that are all on the same line */
 static PositionImage
 render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target)
@@ -197,55 +245,7 @@ render_line (list<dcp::SubtitleString> subtitles, list<shared_ptr<Font> > fonts,
        Pango::FontDescription font (font_name);
        font.set_absolute_size (subtitles.front().size_in_pixels (target.height) * PANGO_SCALE);
        layout->set_font_description (font);
-
-       string marked_up;
-       bool italic = false;
-       bool bold = false;
-       bool underline = false;
-       BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
-               if (i.italic() != italic) {
-                       if (i.italic()) {
-                               marked_up += "<i>";
-                       } else {
-                               marked_up += "</i>";
-                       }
-                       italic = i.italic ();
-               }
-
-               if (i.bold() != bold) {
-                       if (i.bold()) {
-                               marked_up += "<b>";
-                       } else {
-                               marked_up += "</b>";
-                       }
-                       bold = i.bold ();
-               }
-
-               if (i.underline() != underline) {
-                       if (i.underline()) {
-                               marked_up += "<u>";
-                       } else {
-                               marked_up += "</u>";
-                       }
-                       underline = i.underline ();
-               }
-
-               marked_up += i.text ();
-       }
-
-       if (italic) {
-               marked_up += "</i>";
-       }
-
-       if (bold) {
-               marked_up += "</b>";
-       }
-
-       if (underline) {
-               marked_up += "</u>";
-       }
-
-       layout->set_markup (marked_up);
+       layout->set_markup (marked_up (subtitles));
 
        /* Compute fade factor */
        /* XXX */

diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h
index 4fd931781abce82d15897f7b97bb6a9a3721b822..281efe97afcb3649cf01451a91542c33d62179ce 100644 (file)
--- a/src/lib/render_subtitles.h
+++ b/src/lib/render_subtitles.h
@@ -1,5 +1,5 @@
 /*
-    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.
 
@@ -24,4 +24,5 @@
 
 class Font;
 
+std::string marked_up (std::list<dcp::SubtitleString> subtitles);
 std::list<PositionImage> render_subtitles (std::list<dcp::SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size);

diff --git a/test/render_subtitles_test.cc b/test/render_subtitles_test.cc
new file mode 100644 (file)
index 0000000..c56f9df
--- /dev/null
+++ b/test/render_subtitles_test.cc
@@ -0,0 +1,84 @@
+/*
+    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "lib/render_subtitles.h"
+#include <dcp/subtitle_string.h>
+#include <boost/test/unit_test.hpp>
+
+static void
+add (std::list<dcp::SubtitleString>& s, std::string text, bool italic, bool bold, bool underline)
+{
+       s.push_back (
+               dcp::SubtitleString (
+                       boost::optional<std::string> (),
+                       italic,
+                       bold,
+                       underline,
+                       dcp::Colour (255, 255, 255),
+                       42,
+                       1,
+                       dcp::Time (),
+                       dcp::Time (),
+                       1,
+                       dcp::HALIGN_LEFT,
+                       1,
+                       dcp::VALIGN_TOP,
+                       dcp::DIRECTION_LTR,
+                       text,
+                       dcp::NONE,
+                       dcp::Colour (0, 0, 0),
+                       dcp::Time (),
+                       dcp::Time ()
+                       )
+               );
+}
+
+/** Test marked_up() in render_subtitles.cc */
+BOOST_AUTO_TEST_CASE (render_markup_test1)
+{
+       std::list<dcp::SubtitleString> s;
+       add (s, "Hello", false, false, false);
+       BOOST_CHECK_EQUAL (marked_up (s), "Hello");
+}
+
+/** Test marked_up() in render_subtitles.cc */
+BOOST_AUTO_TEST_CASE (render_markup_test2)
+{
+       std::list<dcp::SubtitleString> s;
+       add (s, "Hello", false, true, false);
+       BOOST_CHECK_EQUAL (marked_up (s), "<b>Hello</b>");
+}
+
+
+/** Test marked_up() in render_subtitles.cc */
+BOOST_AUTO_TEST_CASE (render_markup_test3)
+{
+       std::list<dcp::SubtitleString> s;
+       add (s, "Hello", true, true, false);
+       BOOST_CHECK_EQUAL (marked_up (s), "<i><b>Hello</b></i>");
+}
+
+/** Test marked_up() in render_subtitles.cc */
+BOOST_AUTO_TEST_CASE (render_markup_test4)
+{
+       std::list<dcp::SubtitleString> s;
+       add (s, "Hello", true, true, true);
+       BOOST_CHECK_EQUAL (marked_up (s), "<i><b><u>Hello</u></b></i>");
+}

diff --git a/test/wscript b/test/wscript
index 211ead9c26852ecd9d21b1451cd3ae6a24251e94..d336317e56575da2a3e91f4160b507e29a623f97 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -79,6 +79,7 @@ def build(bld):
                  rect_test.cc
                  reels_test.cc
                  required_disk_space_test.cc
+                 render_subtitles_test.cc
                  resampler_test.cc
                  scaling_test.cc
                  seek_zero_test.cc