/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2019 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 "sub_assert.h"
#include "raw_convert.h"
#include "subtitle.h"
-#include <locked_sstream.h>
+#include "compose.hpp"
#include <boost/algorithm/string.hpp>
#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
#include <iostream>
#include <vector>
using std::vector;
using std::map;
using std::cout;
-using std::list;
using boost::optional;
using boost::function;
using namespace boost::algorithm;
using namespace sub;
/** @param s Subtitle string encoded in UTF-8 */
-SSAReader::SSAReader (string const & s)
+SSAReader::SSAReader (string s)
{
- locked_stringstream str (s);
- this->read (boost::bind (&get_line_stringstream, &str));
+ this->read (boost::bind(&get_line_string, &s));
}
/** @param f Subtitle file encoded in UTF-8 */
this->read (boost::bind (&get_line_file, f));
}
+Colour
+h_colour (string s)
+{
+ /* There are both BGR and ABGR versions of these colours */
+ if ((s.length() != 8 && s.length() != 10) || s[0] != '&' || s[1] != 'H') {
+ throw SSAError(String::compose("Badly formatted colour tag %1", s));
+ }
+ int ir, ig, ib;
+ /* XXX: ignoring alpha channel here; note that 00 is opaque and FF is transparent */
+ int const off = s.length() == 10 ? 4 : 2;
+ if (sscanf(s.c_str() + off, "%2x%2x%2x", &ib, &ig, &ir) < 3) {
+ throw SSAError(String::compose("Badly formatted colour tag %1", s));
+ }
+ return sub::Colour(ir / 255.0, ig / 255.0, ib / 255.0);
+}
+
class Style
{
public:
, bold (false)
, italic (false)
, underline (false)
+ , horizontal_reference (HORIZONTAL_CENTRE_OF_SCREEN)
, vertical_reference (BOTTOM_OF_SCREEN)
, vertical_margin (0)
{}
, bold (false)
, italic (false)
, underline (false)
+ , horizontal_reference (HORIZONTAL_CENTRE_OF_SCREEN)
, vertical_reference (BOTTOM_OF_SCREEN)
, vertical_margin (0)
{
vector<string> keys;
- split (keys, format_line, is_any_of (","));
+ split (keys, format_line, boost::is_any_of (","));
vector<string> style;
- split (style, style_line, is_any_of (","));
+ split (style, style_line, boost::is_any_of (","));
SUB_ASSERT (!keys.empty());
SUB_ASSERT (!style.empty());
} else if (keys[i] == "Fontsize") {
font_size = raw_convert<int> (style[i]);
} else if (keys[i] == "PrimaryColour") {
- primary_colour = colour (raw_convert<int> (style[i]));
+ primary_colour = colour (style[i]);
} else if (keys[i] == "BackColour") {
- back_colour = colour (raw_convert<int> (style[i]));
+ back_colour = colour (style[i]);
} else if (keys[i] == "Bold") {
bold = style[i] == "-1";
} else if (keys[i] == "Italic") {
}
} else if (keys[i] == "Alignment") {
/* These values from libass' source code */
+ switch ((raw_convert<int> (style[i]) - 1) % 3) {
+ case 0:
+ horizontal_reference = LEFT_OF_SCREEN;
+ break;
+ case 1:
+ horizontal_reference = HORIZONTAL_CENTRE_OF_SCREEN;
+ break;
+ case 2:
+ horizontal_reference = RIGHT_OF_SCREEN;
+ break;
+ }
switch (raw_convert<int> (style[i]) & 12) {
case 4:
vertical_reference = TOP_OF_SCREEN;
bool italic;
bool underline;
optional<Effect> effect;
+ HorizontalReference horizontal_reference;
VerticalReference vertical_reference;
int vertical_margin;
private:
- Colour colour (int c) const
+ Colour colour (string c) const
{
- return Colour (
- ((c & 0x0000ff) >> 0) / 255.0,
- ((c & 0x00ff00) >> 8) / 255.0,
- ((c & 0xff0000) >> 16) / 255.0
- );
+ if (c.length() > 0 && c[0] == '&') {
+ /* &Hbbggrr or &Haabbggrr */
+ return h_colour (c);
+ } else {
+ /* integer */
+ int i = raw_convert<int>(c);
+ return Colour (
+ ((i & 0x0000ff) >> 0) / 255.0,
+ ((i & 0x00ff00) >> 8) / 255.0,
+ ((i & 0xff0000) >> 16) / 255.0
+ );
+ }
}
};
);
}
+void
+SSAReader::parse_style (RawSubtitle& sub, string style, int play_res_x, int play_res_y)
+{
+ if (style == "\\i1") {
+ sub.italic = true;
+ } else if (style == "\\i0" || style == "\\i") {
+ sub.italic = false;
+ } else if (style == "\\b1") {
+ sub.bold = true;
+ } else if (style == "\\b0") {
+ sub.bold = false;
+ } else if (style == "\\u1") {
+ sub.underline = true;
+ } else if (style == "\\u0") {
+ sub.underline = false;
+ } else if (style == "\\an1") {
+ sub.horizontal_position.reference = sub::LEFT_OF_SCREEN;
+ sub.vertical_position.reference = sub::BOTTOM_OF_SCREEN;
+ } else if (style == "\\an2") {
+ sub.horizontal_position.reference = sub::HORIZONTAL_CENTRE_OF_SCREEN;
+ sub.vertical_position.reference = sub::BOTTOM_OF_SCREEN;
+ } else if (style == "\\an3") {
+ sub.horizontal_position.reference = sub::RIGHT_OF_SCREEN;
+ sub.vertical_position.reference = sub::BOTTOM_OF_SCREEN;
+ } else if (style == "\\an4") {
+ sub.horizontal_position.reference = sub::LEFT_OF_SCREEN;
+ sub.vertical_position.reference = sub::VERTICAL_CENTRE_OF_SCREEN;
+ } else if (style == "\\an5") {
+ sub.horizontal_position.reference = sub::HORIZONTAL_CENTRE_OF_SCREEN;
+ sub.vertical_position.reference = sub::VERTICAL_CENTRE_OF_SCREEN;
+ } else if (style == "\\an6") {
+ sub.horizontal_position.reference = sub::RIGHT_OF_SCREEN;
+ sub.vertical_position.reference = sub::VERTICAL_CENTRE_OF_SCREEN;
+ } else if (style == "\\an7") {
+ sub.horizontal_position.reference = sub::LEFT_OF_SCREEN;
+ sub.vertical_position.reference = sub::TOP_OF_SCREEN;
+ } else if (style == "\\an8") {
+ sub.horizontal_position.reference = sub::HORIZONTAL_CENTRE_OF_SCREEN;
+ sub.vertical_position.reference = sub::TOP_OF_SCREEN;
+ } else if (style == "\\an9") {
+ sub.horizontal_position.reference = sub::RIGHT_OF_SCREEN;
+ sub.vertical_position.reference = sub::TOP_OF_SCREEN;
+ } else if (boost::starts_with(style, "\\pos")) {
+ vector<string> bits;
+ boost::algorithm::split (bits, style, boost::is_any_of("(,"));
+ SUB_ASSERT (bits.size() == 3);
+ sub.horizontal_position.reference = sub::LEFT_OF_SCREEN;
+ sub.horizontal_position.proportional = raw_convert<float>(bits[1]) / play_res_x;
+ sub.vertical_position.reference = sub::TOP_OF_SCREEN;
+ sub.vertical_position.proportional = raw_convert<float>(bits[2]) / play_res_y;
+ } else if (boost::starts_with(style, "\\fs")) {
+ SUB_ASSERT (style.length() > 3);
+ sub.font_size.set_points (raw_convert<int>(style.substr(3)));
+ } else if (boost::starts_with(style, "\\c")) {
+ /* \c&Hbbggrr& */
+ if (style.length() <= 2) {
+ throw SSAError(String::compose("Badly formatted colour tag %1", style));
+ }
+ sub.colour = h_colour (style.substr(2, style.length() - 3));
+ }
+}
+
/** @param base RawSubtitle filled in with any required common values.
* @param line SSA line string (i.e. just the subtitle, possibly with embedded stuff)
* @return List of RawSubtitles to represent line with vertical reference TOP_OF_SUBTITLE.
*/
-list<RawSubtitle>
-SSAReader::parse_line (RawSubtitle base, string line)
+vector<RawSubtitle>
+SSAReader::parse_line (RawSubtitle base, string line, int play_res_x, int play_res_y)
{
enum {
TEXT,
BACKSLASH
} state = TEXT;
- list<RawSubtitle> subs;
+ vector<RawSubtitle> subs;
RawSubtitle current = base;
string style;
/* Count the number of line breaks */
int line_breaks = 0;
- for (size_t i = 0; i < line.length() - 1; ++i) {
- if (line[i] == '\\' && (line[i+1] == 'n' || line[i+1] == 'N')) {
- ++line_breaks;
+ if (line.length() > 0) {
+ for (size_t i = 0; i < line.length() - 1; ++i) {
+ if (line[i] == '\\' && (line[i+1] == 'n' || line[i+1] == 'N')) {
+ ++line_breaks;
+ }
}
}
subs.push_back (current);
current.text = "";
}
- if (style == "\\i1") {
- current.italic = true;
- } else if (style == "\\i0" || style == "\\i") {
- current.italic = false;
- } else if (style == "\\b1") {
- current.bold = true;
- } else if (style == "\\b0") {
- current.bold = false;
- } else if (style == "\\u1") {
- current.underline = true;
- } else if (style == "\\u0") {
- current.underline = false;
- } else if (style == "\\an1" || style == "\\an2" || style == "\\an3") {
- current.vertical_position.reference = sub::BOTTOM_OF_SCREEN;
- } else if (style == "\\an4" || style == "\\an5" || style == "\\an6") {
- current.vertical_position.reference = sub::VERTICAL_CENTRE_OF_SCREEN;
- } else if (style == "\\an7" || style == "\\an8" || style == "\\an9") {
- current.vertical_position.reference = sub::TOP_OF_SCREEN;
- }
-
+ parse_style (current, style, play_res_x, play_res_y);
style = "";
}
EVENTS
} part = INFO;
+ int play_res_x = 288;
int play_res_y = 288;
map<string, Style> styles;
string style_format_line;
switch (part) {
case INFO:
- if (type == "PlayResY") {
+ if (type == "PlayResX") {
+ play_res_x = raw_convert<int> (body);
+ } else if (type == "PlayResY") {
play_res_y = raw_convert<int> (body);
}
break;
case EVENTS:
if (type == "Format") {
split (event_format, body, is_any_of (","));
- BOOST_FOREACH (string& i, event_format) {
+ for (auto& i: event_format) {
trim (i);
}
} else if (type == "Dialogue") {
sub.italic = style.italic;
sub.underline = style.underline;
sub.effect = style.effect;
+ sub.horizontal_position.reference = style.horizontal_reference;
sub.vertical_position.reference = style.vertical_reference;
sub.vertical_position.proportional = float(style.vertical_margin) / play_res_y;
} else if (event_format[i] == "MarginV") {
sub.vertical_position.proportional = raw_convert<float>(event[i]) / play_res_y;
} else if (event_format[i] == "Text") {
- BOOST_FOREACH (sub::RawSubtitle j, parse_line (sub, event[i])) {
+ for (auto j: parse_line (sub, event[i], play_res_x, play_res_y)) {
_subs.push_back (j);
}
}
projects / libsub.git / blobdiff