summaryrefslogtreecommitdiff
path: root/src/parse
diff options
context:
space:
mode:
Diffstat (limited to 'src/parse')
-rw-r--r--src/parse/subtitle.cc12
-rw-r--r--src/parse/subtitle.h3
2 files changed, 13 insertions, 2 deletions
diff --git a/src/parse/subtitle.cc b/src/parse/subtitle.cc
index 56222c97..8c53bd68 100644
--- a/src/parse/subtitle.cc
+++ b/src/parse/subtitle.cc
@@ -147,7 +147,8 @@ Subtitle::fade_time (shared_ptr<const cxml::Node> node, string name, optional<in
}
Text::Text (shared_ptr<const cxml::Node> node, optional<int> tcr)
- : v_align (CENTER)
+ : v_align (VERTICAL_CENTER)
+ , h_align (HORIZONTAL_CENTER)
{
/* Vertical position */
text = node->content ();
@@ -166,6 +167,15 @@ Text::Text (shared_ptr<const cxml::Node> node, optional<int> tcr)
v_align = string_to_valign (v.get ());
}
+ /* Horizontal alignment */
+ optional<string> h = node->optional_string_attribute ("HAlign");
+ if (!h) {
+ h = node->optional_string_attribute ("Halign");
+ }
+ if (h) {
+ h_align = string_to_halign (h.get ());
+ }
+
list<cxml::NodePtr> f = node->node_children ("Font");
for (list<cxml::NodePtr>::iterator i = f.begin(); i != f.end(); ++i) {
font_nodes.push_back (shared_ptr<Font> (new Font (*i, tcr)));
diff --git a/src/parse/subtitle.h b/src/parse/subtitle.h
index 867b3f0e..3993a6be 100644
--- a/src/parse/subtitle.h
+++ b/src/parse/subtitle.h
@@ -34,13 +34,14 @@ class Text
public:
Text ()
: v_position (0)
- , v_align (TOP)
+ , v_align (VERTICAL_TOP)
{}
Text (boost::shared_ptr<const cxml::Node> node, boost::optional<int> tcr);
float v_position;
VAlign v_align;
+ HAlign h_align;
std::string text;
std::list<boost::shared_ptr<Font> > font_nodes;
};