r21117 by fschmid -

[scribus-commit]

Author: fschmid
Date: Fri Mar 25 11:29:39 2016
New Revision: 21117

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21117
Log:
Fixed PDF Export of "PathText" objects with font embedding "Outline all" selected.

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21117&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Fri Mar 25 11:29:39 2016
@@ -161,13 +161,12 @@
 				m_pathBuffer += FillColor;
 
 			m_pathBuffer += "q\n";
+			m_pathBuffer += transformToStr(transform) + " cm\n";
 			m_pathBuffer += FToStr(fontSize()) + " 0 0 " + FToStr(fontSize()) + " " + FToStr(x()) + " " + FToStr((y() - fontSize()) * -1) + " cm\n";
 
 			if (gl.scaleV != 1.0)
 				m_pathBuffer += "1 0 0 1 0 " + FToStr(((fontSize() - fontSize() * gl.scaleV) / fontSize()) * -1) + " cm\n";
-
-			transform.scale(qMax(gl.scaleH, 0.1), qMax(gl.scaleV, 0.1));
-			m_pathBuffer += transformToStr(transform) + " cm\n";
+			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";
@@ -258,13 +257,13 @@
 				m_pathBuffer += FillColor;
 
 			m_pathBuffer += "q\n";
+			m_pathBuffer += transformToStr(transform) + " cm\n";
 			m_pathBuffer += FToStr(fontSize()) + " 0 0 " + FToStr(fontSize()) + " " + FToStr(x()) + " " + FToStr((y() - fontSize()) * -1) + " cm\n";
 
 			if (gl.scaleV != 1.0)
 				m_pathBuffer += "1 0 0 1 0 " + FToStr(((fontSize() - fontSize() * (gl.scaleV)) / fontSize()) * -1) + " cm\n";
 
-			transform.scale(qMax(gl.scaleH, 0.1), qMax(gl.scaleV, 0.1));
-			m_pathBuffer += transformToStr(transform) + " cm\n";
+			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";