diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/reel_writer.cc | 3 | ||||
| -rw-r--r-- | src/lib/render_text.cc | 58 | ||||
| -rw-r--r-- | src/lib/render_text.h | 2 | ||||
| -rw-r--r-- | src/lib/text_decoder.cc | 3 | ||||
| -rw-r--r-- | src/lib/util.cc | 2 |
5 files changed, 48 insertions, 20 deletions
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 44da409a1..78148d18f 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -839,7 +839,8 @@ ReelWriter::empty_text_asset (TextType type, optional<DCPTextTrack> track, bool dcp::Effect::NONE, dcp::Colour(), dcp::Time(), - dcp::Time() + dcp::Time(), + 0 ) ); } diff --git a/src/lib/render_text.cc b/src/lib/render_text.cc index 989bc7dfe..bcf04147a 100644 --- a/src/lib/render_text.cc +++ b/src/lib/render_text.cc @@ -83,27 +83,53 @@ setup_layout (Glib::RefPtr<Pango::Layout> layout, string font_name, string marku 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; @@ -301,7 +327,7 @@ render_line (list<StringText> subtitles, list<shared_ptr<Font>> fonts, dcp::Size 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; diff --git a/src/lib/render_text.h b/src/lib/render_text.h index d1c8c7aee..07a97bb40 100644 --- a/src/lib/render_text.h +++ b/src/lib/render_text.h @@ -27,7 +27,7 @@ namespace dcpomatic { 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 ); diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc index 88f7cd4a9..99b68faba 100644 --- a/src/lib/text_decoder.cc +++ b/src/lib/text_decoder.cc @@ -247,7 +247,8 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle) use libsub for DCP subs) we can cheat by just putting 0 in here. */ dcp::Time (), - dcp::Time () + dcp::Time (), + 0 ) ); } diff --git a/src/lib/util.cc b/src/lib/util.cc index 78ed8da99..c165a5129 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -406,7 +406,7 @@ DCPOMATIC_ENABLE_WARNINGS 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); |