X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffont.cc;h=aa9a8aaef7bc39d556f9377351a83cc0a2fbd401;hp=d729c26965a1490bbef7337701c20dd2eb1d1abd;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/lib/font.cc b/src/lib/font.cc
index d729c2696..aa9a8aaef 100644
--- a/src/lib/font.cc
+++ b/src/lib/font.cc
@@ -1,30 +1,42 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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.
 
-    This program is distributed in the hope that it will be useful,
+    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "font.h"
+#include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
+
+using std::string;
+using namespace dcpomatic;
 
 Font::Font (cxml::NodePtr node)
 	: _id (node->string_child ("Id"))
-	, _file (node->optional_string_child ("File"))
 {
-
+	for (auto i: node->node_children("File")) {
+		string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
+		if (variant == "Normal") {
+			_file = i->content();
+		}
+	}
 }
 
 void
@@ -32,12 +44,23 @@ Font::as_xml (xmlpp::Node* node)
 {
 	node->add_child("Id")->add_child_text (_id);
 	if (_file) {
-		node->add_child("File")->add_child_text (_file.get().string ());
+		node->add_child("File")->add_child_text(_file->string());
 	}
 }
 
+
+bool
+dcpomatic::operator== (Font const & a, Font const & b)
+{
+	if (a.id() != b.id()) {
+		return false;
+	}
+
+	return a.file() == b.file();
+}
+
 bool
-operator!= (Font const & a, Font const & b)
+dcpomatic::operator!= (Font const & a, Font const & b)
 {
-	return (a.id() != b.id() || a.file() != b.file());
+	return !(a == b);
 }