You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
+
+ You must obey the GNU General Public License in all respects
+ for all of the code used other than OpenSSL. If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so. If you
+ do not wish to do so, delete this exception statement from your
+ version. If you delete this exception statement from all source
+ files in the program, then also delete it here.
*/
#include "subtitle_string.h"
optional<string> font,
bool italic,
bool bold,
+ bool underline,
Colour colour,
int size,
float aspect_adjust,
: _font (font)
, _italic (italic)
, _bold (bold)
+ , _underline (underline)
, _colour (colour)
, _size (size)
, _aspect_adjust (aspect_adjust)
a.font() == b.font() &&
a.italic() == b.italic() &&
a.bold() == b.bold() &&
+ a.underline() == b.underline() &&
a.colour() == b.colour() &&
a.size() == b.size() &&
fabs (a.aspect_adjust() - b.aspect_adjust()) < ASPECT_ADJUST_EPSILON &&
s << "normal, ";
}
+ if (sub.underline()) {
+ s << "underlined, ";
+ }
+
s << "size " << sub.size() << ", aspect " << sub.aspect_adjust() << ", colour " << sub.colour()
<< ", vpos " << sub.v_position() << ", valign " << ((int) sub.v_align())
<< ", hpos " << sub.h_position() << ", halign " << ((int) sub.h_align())