/*
- 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
+#include <boost/foreach.hpp>
+
+using std::string;
+using namespace dcpomatic;
Font::Font (cxml::NodePtr node)
: _id (node->string_child ("Id"))
- , _file (node->optional_string_child ("File"))
{
-
+ BOOST_FOREACH (cxml::NodePtr i, node->node_children("File")) {
+ string variant = i->optional_string_attribute("Variant").get_value_or ("Normal");
+ if (variant == "Normal") {
+ _file = i->content();
+ }
+ }
}
void
{
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);
}