CONTENT
} state = COUNTER;
- Time from;
- Time to;
-
- string line;
- int line_number = 0;
+ RawSubtitle rs;
+ rs.font = "Arial";
+ rs.font_size.set_points (48);
+ rs.vertical_position.line = 0;
+ /* XXX: arbitrary */
+ rs.vertical_position.lines = 32;
+ rs.vertical_position.reference = TOP_OF_SUBTITLE;
while (true) {
optional<string> line = get_line ();
}
state = METADATA;
+
+ /* Reset stuff that should not persist across separate subtitles */
+ rs.bold = false;
+ rs.italic = false;
+ rs.underline = false;
+ rs.vertical_position.line = 0;
}
break;
case METADATA:
throw SubripError (*line, "a time/position line");
}
- from = convert_time (p[0]);
- to = convert_time (p[2]);
+ rs.from = convert_time (p[0]);
+ rs.to = convert_time (p[2]);
/* XXX: should not ignore coordinate specifications */
case CONTENT:
if (line->empty ()) {
state = COUNTER;
- line_number = 0;
} else {
- convert_line (*line, line_number, from, to);
- line_number++;
+ convert_line (*line, rs);
+ rs.vertical_position.line = rs.vertical_position.line.get() + 1;
}
break;
}
}
void
-SubripReader::convert_line (string t, int line_number, Time from, Time to)
+SubripReader::convert_line (string t, RawSubtitle& p)
{
enum {
TEXT,
string tag;
- RawSubtitle p;
- p.font = "Arial";
- p.font_size.set_points (48);
- p.from = from;
- p.to = to;
- p.vertical_position.line = line_number;
- /* XXX: arbitrary */
- p.vertical_position.lines = 32;
- p.vertical_position.reference = TOP_OF_SUBTITLE;
-
list<Colour> colours;
colours.push_back (Colour (1, 1, 1));
maybe_content (p);
}
+/* Push p into _subs if it has some text, and clear the text out of p */
void
SubripReader::maybe_content (RawSubtitle& p)
{
BOOST_CHECK_EQUAL (i->lines.size(), 1);
BOOST_CHECK_EQUAL (i->lines.front().blocks.front().text, "Hello world.");
+ ++i;
+ BOOST_CHECK (i != subs.end ());
+ BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 4, 50, 123));
+ BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 4, 55, 23));
+ BOOST_CHECK_EQUAL (i->lines.size(), 2);
+ BOOST_CHECK_EQUAL (i->lines.front().blocks.front().text, "Some italics over");
+ BOOST_CHECK_EQUAL (i->lines.front().blocks.front().italic, true);
+ BOOST_CHECK_EQUAL (i->lines.back().blocks.front().text, "multiple lines");
+ BOOST_CHECK_EQUAL (i->lines.back().blocks.front().italic, true);
+
++i;
BOOST_CHECK (i == subs.end ());
}
{
sub::SubripReader r;
- r.convert_line ("Hello world", 0, sub::Time (), sub::Time ());
+ sub::RawSubtitle rs;
+ r.convert_line ("Hello world", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
r._subs.clear ();
- r.convert_line ("<b>Hello world</b>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<b>Hello world</b>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
BOOST_CHECK_EQUAL (r._subs.front().bold, true);
r._subs.clear ();
- r.convert_line ("<i>Hello world</i>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<i>Hello world</i>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
BOOST_CHECK_EQUAL (r._subs.front().italic, true);
r._subs.clear ();
- r.convert_line ("<u>Hello world</u>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<u>Hello world</u>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
BOOST_CHECK_EQUAL (r._subs.front().underline, true);
r._subs.clear ();
- r.convert_line ("{b}Hello world{/b}", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("{b}Hello world{/b}", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
BOOST_CHECK_EQUAL (r._subs.front().bold, true);
r._subs.clear ();
- r.convert_line ("{i}Hello world{/i}", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("{i}Hello world{/i}", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
BOOST_CHECK_EQUAL (r._subs.front().italic, true);
r._subs.clear ();
- r.convert_line ("{u}Hello world{/u}", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("{u}Hello world{/u}", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "Hello world");
BOOST_CHECK_EQUAL (r._subs.front().underline, true);
r._subs.clear ();
- r.convert_line ("<b>This is <i>nesting</i> of subtitles</b>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<b>This is <i>nesting</i> of subtitles</b>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 3);
list<sub::RawSubtitle>::iterator i = r._subs.begin ();
BOOST_CHECK_EQUAL (i->text, "This is ");
++i;
r._subs.clear ();
- r.convert_line ("<font color=\"#ff00ff\">simple color</font>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<font color=\"#ff00ff\">simple color</font>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK_EQUAL (r._subs.front().text, "simple color");
BOOST_CHECK_EQUAL (r._subs.front().bold, false);
BOOST_CHECK_CLOSE (r._subs.front().colour.b, 1, 0.1);
r._subs.clear ();
- r.convert_line ("<font color=\"#ff0000\">some red text <b>in bold</b></font>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<font color=\"#ff0000\">some red text <b>in bold</b></font>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 2);
i = r._subs.begin ();
BOOST_CHECK_EQUAL (i->text, "some red text ");
BOOST_CHECK (fabs (i->colour.b) < 0.01);
r._subs.clear ();
- r.convert_line ("<font color=\"#0000ff\">some blue text <b>in bold</b></font>", 0, sub::Time (), sub::Time ());
+ rs = sub::RawSubtitle();
+ r.convert_line ("<font color=\"#0000ff\">some blue text <b>in bold</b></font>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 2);
i = r._subs.begin ();
BOOST_CHECK_EQUAL (i->text, "some blue text ");