/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2021 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 "dcpomatic_assert.h"
#include "font.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+LIBDCP_ENABLE_WARNINGS
+
+
+using std::string;
+using boost::optional;
+using namespace dcpomatic;
+
Font::Font (cxml::NodePtr node)
+ : _id (node->string_child("Id"))
{
- 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") {
+ _content.file = i->content();
+ }
+ }
}
+
void
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("Id")->add_child_text(_id);
+ if (_content.file) {
+ node->add_child("File")->add_child_text(_content.file->string());
}
}
+
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);
+ if (a.id() != b.id()) {
+ return false;
+ }
+
+ /* XXX: it's dubious that this ignores _data, though I think it's OK for the cases
+ * where operator== is used. Perhaps we should remove operator== and have a more
+ * specific comparator.
+ */
+
+ return a.file() == b.file();
}
+
+
+bool
+dcpomatic::operator!= (Font const & a, Font const & b)
+{
+ return !(a == b);
+}
+
+
+optional<dcp::ArrayData>
+Font::data () const
+{
+ if (_content.data) {
+ return _content.data;
+ }
+
+ if (_content.file) {
+ return dcp::ArrayData(*_content.file);
+ }
+
+ return {};
+}
+