/*
Copyright (C) 2014-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include <cairomm/cairomm.h>
#include <pangomm.h>
#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
#include <iostream>
using std::list;
using std::cerr;
using std::make_pair;
using boost::shared_ptr;
+using boost::make_shared;
using boost::optional;
static FcConfig* fc_config = 0;
/* ...and add a bit more for luck */
height += target.height / 11;
- shared_ptr<Image> image (new Image (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false));
+ shared_ptr<Image> image = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (target.width, height), false);
image->make_black ();
#ifdef DCPOMATIC_HAVE_FORMAT_STRIDE_FOR_WIDTH
string marked_up;
bool italic = false;
+ bool bold = false;
BOOST_FOREACH (dcp::SubtitleString const & i, subtitles) {
if (i.italic() != italic) {
if (i.italic()) {
italic = i.italic ();
}
+ if (i.bold() != bold) {
+ if (i.bold()) {
+ marked_up += "<b>";
+ } else {
+ marked_up += "</b>";
+ }
+ bold = i.bold ();
+ }
+
marked_up += i.text ();
}
marked_up += "</i>";
}
+ if (bold) {
+ marked_up += "</b>";
+ }
+
layout->set_markup (marked_up);
/* Compute fade factor */