# HG changeset patch # User Pantxo Diribarne # Date 1588240461 -7200 # Node ID 18bd65ad4e7d943136f1334dcfd4f0308c5eb48f # Parent 014e80a92d4fd2051e93f42dd56f10f509ce14b2# Parent 3d6c5eb545159a9edee1979851c374959d1cfb70 maint: merge stable to default diff -r 014e80a92d4f -r 18bd65ad4e7d src/octave-svgconvert.cc --- a/src/octave-svgconvert.cc Tue Apr 28 16:24:10 2020 -0700 +++ b/src/octave-svgconvert.cc Thu Apr 30 11:54:21 2020 +0200 @@ -435,7 +435,7 @@ else if (elt.tagName () == "tspan") { // Font - QFont saved_font(font); + QFont saved_font (font); QString str = elt.attribute ("font-family"); if (! str.isEmpty ()) @@ -450,6 +450,15 @@ font.setWeight (QFont::Normal); } + str = elt.attribute ("font-style"); + if (! str.isEmpty ()) + { + if (str != "normal") + font.setStyle (QFont::StyleItalic); + else + font.setStyle (QFont::StyleNormal); + } + int sz = elt.attribute ("font-size").toInt (); if (sz > 0) font.setPixelSize (sz);