From 025902959a3e95304fe5d421210bfb5e8f524ae8 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sun, 28 Jan 2018 16:14:44 +0100
Subject: [PATCH 09/12] handle italic style

---
 Scribus/scribus/plugins/import/revenge/rawpainter.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Scribus/scribus/plugins/import/revenge/rawpainter.cpp b/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
index 4cb0d52e7..3fa4a8cf5 100644
--- a/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
+++ b/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
@@ -1640,11 +1640,13 @@ void RawPainter::openSpan(const librevenge::RVNGPropertyList &propList)
 	const librevenge::RVNGProperty *fontNameProp = propList["style:font-name"] ? propList["style:font-name"] : propList["fo:font-name"];
 	if (fontNameProp)
 	{
-		QString fontVari;
-		if (propList["fo:font-weight"])
-			fontVari = QString(propList["fo:font-weight"]->getStr().cstr());
+		QStringList fontVari;
+		if (propList["fo:font-weight"] && propList["fo:font-weight"]->getStr() != "normal")
+			fontVari.append(propList["fo:font-weight"]->getStr().cstr());
+		if (propList["fo:font-style"] && propList["fo:font-style"]->getStr() != "normal")
+			fontVari.append(propList["fo:font-style"]->getStr().cstr());
 		QString fontName = QString(fontNameProp->getStr().cstr());
-		QString realFontName = constructFontName(fontName, fontVari);
+		QString realFontName = constructFontName(fontName, fontVari.join(' '));
 		textCharStyle.setFont((*m_Doc->AllFonts)[realFontName]);
 	}
 	StyleFlag styleEffects = textCharStyle.effects();
-- 
2.14.3

