X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsubtitle_string.cc;h=5a22475c65ff9f3c9a91ab6116bddd2865a49406;hb=refs%2Fheads%2F1.0-templates;hp=2aadc9e9efbe9d258cd3a3cdcbe2142dfa1f4758;hpb=a641fdc912a3f0749015decdf9e23ff15186ef78;p=libdcp.git

diff --git a/src/subtitle_string.cc b/src/subtitle_string.cc
index 2aadc9e9..5a22475c 100644
--- a/src/subtitle_string.cc
+++ b/src/subtitle_string.cc
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "subtitle_string.h"
@@ -31,6 +45,7 @@ SubtitleString::SubtitleString (
 	optional<string> font,
 	bool italic,
 	bool bold,
+	bool underline,
 	Colour colour,
 	int size,
 	float aspect_adjust,
@@ -50,6 +65,7 @@ SubtitleString::SubtitleString (
 	: _font (font)
 	, _italic (italic)
 	, _bold (bold)
+	, _underline (underline)
 	, _colour (colour)
 	, _size (size)
 	, _aspect_adjust (aspect_adjust)
@@ -87,6 +103,7 @@ dcp::operator== (SubtitleString const & a, SubtitleString const & b)
 		a.font() == b.font() &&
 		a.italic() == b.italic() &&
 		a.bold() == b.bold() &&
+		a.underline() == b.underline() &&
 		a.colour() == b.colour() &&
 		a.size() == b.size() &&
 		fabs (a.aspect_adjust() - b.aspect_adjust()) < ASPECT_ADJUST_EPSILON &&
@@ -124,6 +141,10 @@ dcp::operator<< (ostream& s, SubtitleString const & sub)
 		s << "normal, ";
 	}
 
+	if (sub.underline()) {
+		s << "underlined, ";
+	}
+
 	s << "size " << sub.size() << ", aspect " << sub.aspect_adjust() << ", colour " << sub.colour()
 	  << ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align())
 	  << ", hpos " << sub.h_position() << ", halign " << ((int) sub.h_align())