1 files changed, 18 insertions, 5 deletions

diff --git a/src/font_node.cc b/src/font_node.cc
index 6dd6e58f..1aa4be6b 100644
--- a/src/font_node.cc
+++ b/src/font_node.cc
@@ -45,15 +45,24 @@ using boost::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
-FontNode::FontNode (cxml::ConstNodePtr node, optional<int> tcr, string font_id_attribute)
+FontNode::FontNode (cxml::ConstNodePtr node, optional<int> tcr, Standard standard)
 {
 	text = node->content ();
 
-	id = node->optional_string_attribute (font_id_attribute);
+	if (standard == INTEROP) {
+		id = node->optional_string_attribute ("Id");
+	} else {
+		id = node->optional_string_attribute ("ID");
+	}
 	size = node->optional_number_attribute<int64_t> ("Size").get_value_or (0);
 	aspect_adjust = node->optional_number_attribute<float> ("AspectAdjust");
 	italic = node->optional_bool_attribute ("Italic");
 	bold = node->optional_string_attribute("Weight").get_value_or("normal") == "bold";
+	if (standard == INTEROP) {
+		underline = node->optional_bool_attribute ("Underlined");
+	} else {
+		underline = node->optional_bool_attribute ("Underline");
+	}
 	optional<string> c = node->optional_string_attribute ("Color");
 	if (c) {
 		colour = Colour (c.get ());
@@ -69,17 +78,17 @@ FontNode::FontNode (cxml::ConstNodePtr node, optional<int> tcr, string font_id_a
 
 	list<cxml::NodePtr> s = node->node_children ("Subtitle");
 	BOOST_FOREACH (cxml::NodePtr& i, s) {
-		subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, tcr, font_id_attribute)));
+		subtitle_nodes.push_back (shared_ptr<SubtitleNode> (new SubtitleNode (i, tcr, standard)));
 	}
 
 	list<cxml::NodePtr> f = node->node_children ("Font");
 	BOOST_FOREACH (cxml::NodePtr& i, f) {
-		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, tcr, font_id_attribute)));
+		font_nodes.push_back (shared_ptr<FontNode> (new FontNode (i, tcr, standard)));
 	}
 
 	list<cxml::NodePtr> t = node->node_children ("Text");
 	BOOST_FOREACH (cxml::NodePtr& i, t) {
-		text_nodes.push_back (shared_ptr<TextNode> (new TextNode (i, tcr, font_id_attribute)));
+		text_nodes.push_back (shared_ptr<TextNode> (new TextNode (i, tcr, standard)));
 	}
 }
 
@@ -87,6 +96,7 @@ FontNode::FontNode (std::list<boost::shared_ptr<FontNode> > const & font_nodes)
 	: size (0)
 	, italic (false)
 	, bold (false)
+	, underline (false)
 	, colour ("FFFFFFFF")
 	, effect_colour ("FFFFFFFF")
 {
@@ -106,6 +116,9 @@ FontNode::FontNode (std::list<boost::shared_ptr<FontNode> > const & font_nodes)
 		if ((*i)->bold) {
 			bold = (*i)->bold.get ();
 		}
+		if ((*i)->underline) {
+			underline = (*i)->underline.get ();
+		}
 		if ((*i)->colour) {
 			colour = (*i)->colour.get ();
 		}