#include <iostream>
#include <cstdio>
-using std::list;
using std::cerr;
using std::vector;
using std::fabs;
FILE* f = fopen ("test/data/test.srt", "r");
sub::SubripReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<std::vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
+ auto i = subs.begin ();
/* First subtitle */
BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 0, 41, 90));
BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 0, 42, 210));
- list<sub::Line>::iterator j = i->lines.begin ();
+ auto j = i->lines.begin();
BOOST_CHECK (j != i->lines.end ());
BOOST_CHECK_EQUAL (j->blocks.size(), 1);
- sub::Block b = j->blocks.front ();
+ auto b = j->blocks.front();
BOOST_CHECK_EQUAL (b.text, "This is a subtitle");
/* No font is specified by subrip, so none should be seen here */
BOOST_CHECK (!b.font);
BOOST_CHECK_EQUAL (l.vertical_position.line.get(), 0);
BOOST_CHECK_EQUAL (l.vertical_position.reference.get(), sub::TOP_OF_SUBTITLE);
- list<sub::Block>::iterator k = l.blocks.begin ();
+ auto k = l.blocks.begin();
BOOST_CHECK (k != l.blocks.end ());
BOOST_CHECK_EQUAL (k->text, "This is some ");
FILE* f = fopen ("test/data/test2.srt", "r");
sub::SubripReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::const_iterator i = subs.begin();
+ auto i = subs.begin();
BOOST_CHECK (i != subs.end ());
BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 1, 49, 200));
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 ();
+ auto i = r._subs.begin();
+ BOOST_CHECK_EQUAL (i->text, "This is ");
+ BOOST_CHECK_EQUAL (i->bold, true);
+ BOOST_CHECK_EQUAL (i->italic, false);
+ ++i;
+ BOOST_CHECK_EQUAL (i->text, "nesting");
+ BOOST_CHECK_EQUAL (i->bold, true);
+ BOOST_CHECK_EQUAL (i->italic, true);
+ ++i;
+ BOOST_CHECK_EQUAL (i->text, " of subtitles");
+ BOOST_CHECK_EQUAL (i->bold, true);
+ BOOST_CHECK_EQUAL (i->italic, false);
+ ++i;
+ r._subs.clear ();
+
+ rs = sub::RawSubtitle();
+ r.convert_line ("<B>This is <I>nesting</I> of subtitles</B>", rs);
+ BOOST_CHECK_EQUAL (r._subs.size(), 3);
+ i = r._subs.begin();
BOOST_CHECK_EQUAL (i->text, "This is ");
BOOST_CHECK_EQUAL (i->bold, true);
BOOST_CHECK_EQUAL (i->italic, false);
BOOST_CHECK_CLOSE (r._subs.front().colour.b, 1, 0.1);
r._subs.clear ();
+ /* single quotes are apparently also allowed */
+ 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.r, 1, 0.1);
+ BOOST_CHECK(fabs(r._subs.front().colour.g) < 0.01);
+ BOOST_CHECK_CLOSE(r._subs.front().colour.b, 1, 0.1);
+ r._subs.clear();
+
rs = sub::RawSubtitle();
r.convert_line ("<font color=\"#FF00FF\">simple color in capitals</font>", rs);
BOOST_CHECK_EQUAL (r._subs.size(), 1);
BOOST_CHECK (fabs (i->colour.g) < 0.01);
BOOST_CHECK_CLOSE (i->colour.b, 1, 0.1);
r._subs.clear ();
+
+ rs = sub::RawSubtitle();
+ r.convert_line("<font color=\"#0000ffdd\">some blue text with alpha</font>", rs);
+ BOOST_CHECK_EQUAL(r._subs.size(), 1);
+ i = r._subs.begin();
+ BOOST_CHECK_EQUAL(i->text, "some blue text with alpha");
+ BOOST_CHECK_EQUAL(i->bold, false);
+ BOOST_CHECK(fabs(i->colour.r) < 0.01);
+ BOOST_CHECK(fabs(i->colour.g) < 0.01);
+ BOOST_CHECK_CLOSE(i->colour.b, 1, 0.1);
+ r._subs.clear();
+
+ rs = sub::RawSubtitle();
+ r.convert_line ("<< angle brackets but no HTML >>", rs);
+ BOOST_CHECK_EQUAL (r._subs.size(), 1);
+ i = r._subs.begin ();
+ BOOST_CHECK_EQUAL (i->text, "<< angle brackets but no HTML >>");
+ r._subs.clear();
}
/** Test SubripReader::convert_time */
BOOST_AUTO_TEST_CASE (subrip_reader_convert_time_test)
{
sub::SubripReader reader;
- BOOST_CHECK_EQUAL (reader.convert_time ("00:03:10,500"), sub::Time::from_hms (0, 3, 10, 500));
- BOOST_CHECK_EQUAL (reader.convert_time ("04:19:51,782"), sub::Time::from_hms (4, 19, 51, 782));
+ auto t = reader.convert_time("00:03:10,500", ",");
+ BOOST_REQUIRE(t);
+ BOOST_CHECK_EQUAL(*t, sub::Time::from_hms(0, 3, 10, 500));
+ t = reader.convert_time("04:19:51,782", ",");
+ BOOST_REQUIRE(t);
+ BOOST_CHECK_EQUAL(*t, sub::Time::from_hms(4, 19, 51, 782));
}
static void
FILE* f = fopen (p.string().c_str(), "r");
sub::SubripReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<std::vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
- list<sub::Line>::iterator j;
- list<sub::Block>::iterator k;
+ auto i = subs.begin ();
+ vector<sub::Line>::iterator j;
+ vector<sub::Block>::iterator k;
BOOST_REQUIRE (i != subs.end ());
FILE* f = fopen (p.string().c_str(), "r");
sub::SubripReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> >(reader.subtitles());
+ auto subs = sub::collect<std::vector<sub::Subtitle>>(reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
+ auto i = subs.begin();
std::cout << i->lines.front().blocks.front().text << "\n";
std::string const t = i->lines.front().blocks.front().text;
BOOST_CHECK_CLOSE (r._subs.front().colour.b, 3.0 / 255, 0.1);
}
+
/** Test alignment */
BOOST_AUTO_TEST_CASE (subrip_reader_test6)
{
r._subs.clear ();
}
+
+BOOST_AUTO_TEST_CASE(subrip_with_unicode_line_separator_test)
+{
+ auto f = fopen ("test/data/newline.srt", "r");
+ BOOST_REQUIRE(f);
+ sub::SubripReader reader(f);
+ fclose(f);
+ auto subs = sub::collect<std::vector<sub::Subtitle>>(reader.subtitles());
+
+ BOOST_REQUIRE_EQUAL(subs.size(), 2U);
+
+ BOOST_REQUIRE_EQUAL(subs[0].lines.size(), 2U);
+ BOOST_REQUIRE_EQUAL(subs[0].lines[0].blocks.size(), 1U);
+ BOOST_CHECK_EQUAL(subs[0].lines[0].blocks[0].text, "Du fühlst dich danach besser.");
+ BOOST_REQUIRE_EQUAL(subs[0].lines[1].blocks.size(), 1U);
+ BOOST_CHECK_EQUAL(subs[0].lines[1].blocks[0].text, "Okay, Kleiner?");
+
+ BOOST_REQUIRE_EQUAL(subs[1].lines.size(), 2U);
+ BOOST_REQUIRE_EQUAL(subs[1].lines[0].blocks.size(), 1U);
+ BOOST_CHECK_EQUAL(subs[1].lines[0].blocks[0].text, "Sie kann es nicht machen");
+ BOOST_REQUIRE_EQUAL(subs[1].lines[1].blocks.size(), 1U);
+ BOOST_CHECK_EQUAL(subs[1].lines[1].blocks[0].text, "wenn du dich bewegst.");
+}
+