# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.2'))
- deps.append(('libsub', 'v1.6.2'))
+ deps.append(('libdcp', 'v1.8.3'))
+ deps.append(('libsub', 'v1.6.3'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
dcp::Effect::NONE,
dcp::Colour(),
dcp::Time(),
- dcp::Time()
+ dcp::Time(),
+ 0
)
);
}
string
-marked_up (list<StringText> subtitles, int target_height, float fade_factor)
+marked_up (list<StringText> subtitles, int target_height, float fade_factor, string font_name)
{
- string out;
+ auto constexpr pixels_to_1024ths_point = 72 * 1024 / 96;
- for (auto const& i: subtitles) {
- out += "<span ";
- if (i.italic()) {
- out += "style=\"italic\" ";
+ auto make_span = [target_height, fade_factor](StringText const& subtitle, string text, string extra_attribute) {
+ string span;
+ span += "<span ";
+ if (subtitle.italic()) {
+ span += "style=\"italic\" ";
}
- if (i.bold()) {
- out += "weight=\"bold\" ";
+ if (subtitle.bold()) {
+ span += "weight=\"bold\" ";
}
- if (i.underline()) {
- out += "underline=\"single\" ";
+ if (subtitle.underline()) {
+ span += "underline=\"single\" ";
}
- out += "size=\"" + dcp::raw_convert<string>(i.size_in_pixels(target_height) * 72 * 1024 / 96) + "\" ";
+ span += "size=\"" + dcp::raw_convert<string>(subtitle.size_in_pixels(target_height) * pixels_to_1024ths_point) + "\" ";
/* Between 1-65535 inclusive, apparently... */
- out += "alpha=\"" + dcp::raw_convert<string>(int(floor(fade_factor * 65534)) + 1) + "\" ";
- out += "color=\"#" + i.colour().to_rgb_string() + "\">";
- out += i.text();
- out += "</span>";
+ span += "alpha=\"" + dcp::raw_convert<string>(int(floor(fade_factor * 65534)) + 1) + "\" ";
+ span += "color=\"#" + subtitle.colour().to_rgb_string() + "\"";
+ if (!extra_attribute.empty()) {
+ span += " " + extra_attribute;
+ }
+ span += ">";
+ span += text;
+ span += "</span>";
+ return span;
+ };
+
+ string out;
+ for (auto const& i: subtitles) {
+ if (std::abs(i.space_before()) > dcp::SPACE_BEFORE_EPSILON) {
+ /* We need to insert some horizontal space into the layout. The only way I can find to do this
+ * is to write a " " with some special letter_spacing. As far as I can see, such a space will
+ * be written with letter_spacing either side. This means that to get a horizontal space x we
+ * need to write a " " with letter spacing (x - s) / 2, where s is the width of the " ".
+ */
+ auto layout = create_layout();
+ setup_layout(layout, font_name, make_span(i, " ", {}));
+ int space_width;
+ int dummy;
+ layout->get_pixel_size(space_width, dummy);
+ auto spacing = ((i.space_before() * i.size_in_pixels(target_height) - space_width) / 2) * pixels_to_1024ths_point;
+ out += make_span(i, " ", "letter_spacing=\"" + dcp::raw_convert<string>(spacing) + "\"");
+ }
+
+ out += make_span(i, i.text(), {});
}
return out;
auto const font_name = setup_font (first, fonts);
auto const fade_factor = calculate_fade_factor (first, time, frame_rate);
- auto const markup = marked_up (subtitles, target.height, fade_factor);
+ auto const markup = marked_up (subtitles, target.height, fade_factor, font_name);
auto layout = create_layout ();
setup_layout (layout, font_name, markup);
dcp::Size size;
class Font;
}
-std::string marked_up (std::list<StringText> subtitles, int target_height, float fade_factor);
+std::string marked_up (std::list<StringText> subtitles, int target_height, float fade_factor, std::string font_name);
std::list<PositionImage> render_text (
std::list<StringText>, std::list<std::shared_ptr<dcpomatic::Font> > fonts, dcp::Size, dcpomatic::DCPTime, int
);
use libsub for DCP subs) we can cheat by just putting 0 in here.
*/
dcp::Time (),
- dcp::Time ()
+ dcp::Time (),
+ 0
)
);
}
list<StringText> subs;
dcp::SubtitleString ss(
optional<string>(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HAlign::CENTER, 0, dcp::VAlign::CENTER, dcp::Direction::LTR,
- "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time()
+ "Hello dolly", dcp::Effect::NONE, dcp::Colour(), dcp::Time(), dcp::Time(), 0
);
subs.push_back (StringText(ss, 0));
render_text (subs, list<shared_ptr<Font>>(), dcp::Size(640, 480), DCPTime(), 24);
dcp::Effect::NONE,
dcp::Colour (0, 0, 0),
dcp::Time (),
- dcp::Time ()
+ dcp::Time (),
+ 0
),
2
)
{
std::list<StringText> s;
add (s, "Hello", false, false, false);
- BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+ BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
{
std::list<StringText> s;
add (s, "Hello", false, true, false);
- BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+ BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
{
std::list<StringText> s;
add (s, "Hello", true, true, false);
- BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+ BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
{
std::list<StringText> s;
add (s, "Hello", true, true, true);
- BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
+ BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" weight=\"bold\" underline=\"single\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span>");
}
/** Test marked_up() in render_text.cc */
std::list<StringText> s;
add (s, "Hello", false, true, false);
add (s, " world.", false, false, false);
- BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
+ BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world.</span>");
}
/** Test marked_up() in render_text.cc */
add (s, "Hello", true, false, false);
add (s, " world ", false, false, false);
add (s, "we are bold.", false, true, false);
- BOOST_CHECK_EQUAL (marked_up (s, 1024, 1), "<span style=\"italic\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>");
+ BOOST_CHECK_EQUAL (marked_up(s, 1024, 1, ""), "<span style=\"italic\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">Hello</span><span size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\"> world </span><span weight=\"bold\" size=\"41472\" alpha=\"65535\" color=\"#FFFFFF\">we are bold.</span>");
}
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.2'
-libsub_version = '1.6.2'
+libdcp_version = '1.8.3'
+libsub_version = '1.6.3'
this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0]
last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0]