/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "ssa_reader.h"
#include "collect.h"
#include "subtitle.h"
+#include "exceptions.h"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
-#include <boost/foreach.hpp>
#include <cstdio>
#include <cmath>
#include <iostream>
-using std::list;
using std::fabs;
+using std::vector;
BOOST_AUTO_TEST_CASE (ssa_reader_test)
{
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<vector<sub::Subtitle>> (reader.subtitles());
- list<sub::Subtitle>::iterator i = subs.begin ();
+ auto i = subs.begin ();
BOOST_REQUIRE (i != subs.end ());
BOOST_CHECK_EQUAL (i->from, sub::Time::from_hms (0, 2, 40, 650));
BOOST_CHECK_EQUAL (i->to, sub::Time::from_hms (0, 2, 41, 790));
- list<sub::Line>::iterator j = i->lines.begin();
+ auto j = i->lines.begin();
BOOST_REQUIRE (j != i->lines.end ());
BOOST_REQUIRE_EQUAL (j->blocks.size(), 1);
sub::Block b = j->blocks.front ();
BOOST_AUTO_TEST_CASE (ssa_reader_line_test1)
{
sub::RawSubtitle base;
- list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+ auto r = sub::SSAReader::parse_line (
base,
"This is a line with some {\\i1}italics{\\i0} and then\\nthere is a new line.",
1920, 1080
);
- list<sub::RawSubtitle>::const_iterator i = r.begin ();
+ auto i = r.begin();
BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
BOOST_CHECK_EQUAL (i->italic, false);
++i;
BOOST_AUTO_TEST_CASE (ssa_reader_line_test2)
{
sub::RawSubtitle base;
- list<sub::RawSubtitle> r = sub::SSAReader::parse_line (
+ auto r = sub::SSAReader::parse_line (
base,
"{\\i1}It's all just italics{\\i0}",
1920, 1080
);
- list<sub::RawSubtitle>::const_iterator i = r.begin ();
+ auto i = r.begin ();
BOOST_CHECK_EQUAL (i->text, "It's all just italics");
BOOST_CHECK_EQUAL (i->italic, true);
++i;
{
test ("DKH_UT_EN20160601def.ssa");
test ("dcpsubtest-en.ssa");
+ test ("dcpsubtest-en.ssa");
+ test ("W_GERMAN_SUBS_grey.ass");
}
#define SUB_START(f, t) \
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<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;
/* Hello world */
SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
/* Alignments */
SUB_START (sub::Time::from_hms (0, 0, 9, 230), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::LEFT_OF_SCREEN);
BLOCK("bottom left", "Arial", 20, false, false, false);
SUB_END ();
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 250), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ LINE (0, sub::BOTTOM_OF_SCREEN, 0, sub::RIGHT_OF_SCREEN);
BLOCK("bottom right", "Arial", 20, false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 260), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::LEFT_OF_SCREEN);
BLOCK("middle left", "Arial", 20, false, false, false);
SUB_END ();
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 280), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ LINE (0, sub::VERTICAL_CENTRE_OF_SCREEN, 0, sub::RIGHT_OF_SCREEN);
BLOCK("middle right", "Arial", 20, false, false, false);
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 290), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ LINE (0, sub::TOP_OF_SCREEN, 0, sub::LEFT_OF_SCREEN);
BLOCK("top left", "Arial", 20, false, false, false);
SUB_END ();
SUB_END ();
SUB_START (sub::Time::from_hms (0, 0, 9, 310), sub::Time::from_hms (0, 0, 11, 560));
- LINE (0, sub::TOP_OF_SCREEN, 0, sub::HORIZONTAL_CENTRE_OF_SCREEN);
+ LINE (0, sub::TOP_OF_SCREEN, 0, sub::RIGHT_OF_SCREEN);
BLOCK("top right", "Arial", 20, false, false, false);
SUB_END ();
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<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::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<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 ());
BOOST_REQUIRE (f);
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<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 ());
}
/** Test \pos */
-BOOST_AUTO_TEST_CASE (ssa_reader_line_pos)
+BOOST_AUTO_TEST_CASE (ssa_reader_pos)
{
boost::filesystem::path p = "test/data/test2.ssa";
FILE* f = fopen (p.string().c_str(), "r");
sub::SSAReader reader (f);
fclose (f);
- list<sub::Subtitle> subs = sub::collect<std::list<sub::Subtitle> > (reader.subtitles ());
+ auto subs = sub::collect<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;
/* Hello world */
SUB_START (sub::Time::from_hms (0, 0, 1, 230), sub::Time::from_hms (0, 0, 4, 550));
BLOCK ("positioning.", "Arial", 20, false, false, false);
SUB_END();
}
+
+/** Test \fs */
+BOOST_AUTO_TEST_CASE (ssa_reader_fs)
+{
+ sub::RawSubtitle base;
+ auto r = sub::SSAReader::parse_line (
+ base,
+ "This is a line with some {\\fs64}font sizing.",
+ 1920, 1080
+ );
+
+ auto i = r.begin ();
+ BOOST_CHECK_EQUAL (i->text, "This is a line with some ");
+ ++i;
+ BOOST_REQUIRE (i != r.end ());
+
+ BOOST_CHECK_EQUAL (i->text, "font sizing.");
+ BOOST_CHECK (i->font_size.points());
+ BOOST_CHECK_EQUAL (i->font_size.points().get(), 64);
+ ++i;
+ BOOST_REQUIRE (i == r.end ());
+}
+
+/** Test a valid \c */
+BOOST_AUTO_TEST_CASE (ssa_reader_c)
+{
+ sub::RawSubtitle base;
+ auto r = sub::SSAReader::parse_line (
+ base,
+ "{\\c&H00FFFF&}Dieser Untertitel ist gelb",
+ 1920, 1080
+ );
+
+ auto i = r.begin ();
+ BOOST_CHECK_EQUAL (i->text, "Dieser Untertitel ist gelb");
+ BOOST_CHECK (i->colour == sub::Colour::from_rgb_hex("ffff00"));
+ ++i;
+ BOOST_REQUIRE (i == r.end ());
+}
+
+/** Test invalid \c */
+BOOST_AUTO_TEST_CASE (ssa_reader_c_bad)
+{
+ sub::RawSubtitle base;
+ BOOST_CHECK_THROW(
+ sub::SSAReader::parse_line(
+ base,
+ "{\\c&H0}Dieser Untertitel ist gelb",
+ 1920, 1080
+ ),
+ sub::SSAError
+ );
+}
projects / libsub.git / blobdiff