r21894 by jghali - #14743: Fonts after outline displays wrong characters

[scribus-commit]

Author: jghali
Date: Fri Apr 14 15:12:54 2017
New Revision: 21894

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21894
Log:
#14743: Fonts after outline displays wrong characters

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21894&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Fri Apr 14 15:12:54 2017
@@ -170,7 +170,7 @@
 				m_pathBuffer += FToStr(qMax(gl.scaleH, 0.1)) + " 0 0 " + FToStr(qMax(gl.scaleV, 0.1)) + " 0 0 cm\n";
 
 				if (!FillColor.isEmpty())
-					m_pathBuffer += pdfFont.name + Pdf::toPdf(gl.glyph) + " Do\n";
+					m_pathBuffer += pdfFont.name + "_gl" + Pdf::toPdf(gl.glyph) + " Do\n";
 				m_pathBuffer += "Q\n";
 			}
 			else
@@ -271,7 +271,7 @@
 				m_pathBuffer += FToStr(qMax(gc.scaleH(), 0.1)) + " 0 0 " + FToStr(qMax(gc.scaleV(), 0.1)) + " 0 0 cm\n";
 
 				if (!FillColor.isEmpty())
-					m_pathBuffer += pdfFont.name + Pdf::toPdf(gl.glyph) + " Do\n";
+					m_pathBuffer += pdfFont.name + "_gl" + Pdf::toPdf(gl.glyph) + " Do\n";
 
 				FPointArray outline = font().glyphOutline(gl.glyph);
 				QTransform mat;
@@ -1637,7 +1637,7 @@
 			PutDoc("\n/Filter /FlateDecode");
 		PutDoc(" >>\nstream\n"+EncStream(fon, fontGlyphXForm)+"\nendstream");
 		writer.endObj(fontGlyphXForm);
-		pageData.XObjects[fontName + Pdf::toPdf(ig.key())] = fontGlyphXForm;
+		pageData.XObjects[fontName + "_gl" + Pdf::toPdf(ig.key())] = fontGlyphXForm;
 	}
 	return result;
 }