changeset 28255:18bd65ad4e7d

maint: merge stable to default
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Thu, 30 Apr 2020 11:54:21 +0200
parents 014e80a92d4f (current diff) 3d6c5eb54515 (diff)
children e9126e73748a
files
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);