r20668 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Jan  6 22:04:12 2016
New Revision: 20668

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20668
Log:
update Windows printing vs lates changes to text frame rendering

Modified:
    trunk/Scribus/scribus/scpageoutput.cpp

Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20668&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp	(original)
+++ trunk/Scribus/scribus/scpageoutput.cpp	Wed Jan  6 22:04:12 2016
@@ -592,6 +592,7 @@
 			else if ((style.font().isStroked()) && ((style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0) != 0))
 			{
 				ScColorShade tmp = painter->brush();
+				painter->setStrokeMode(1);
 				painter->setPen(tmp, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 				painter->setLineWidth(style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0);
 				painter->strokePath();
@@ -614,6 +615,7 @@
 					fillPath(item, painter, clip);
 				if ((style.effects() & ScStyle_Outline) && (style.strokeColor() != CommonStrings::None) && ((style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0) != 0))
 				{
+					painter->setStrokeMode(1);
 					painter->setLineWidth((style.fontSize() * glyphs.scaleV * style.outlineWidth() / 10000.0) / glySc);
 					painter->strokePath();
 				}
@@ -1690,7 +1692,10 @@
 						y2 = ls.y;
 						descent = ls.descent;
 						if ((llp + 1) < item->textLayout.lines())
-							descent += LineStyle.lineSpacing() - (ls.descent + item->textLayout.line(llp + 1).ascent);
+						{
+							if ((item->textLayout.line(llp + 1).lastItem - item->textLayout.line(llp + 1).firstItem) > 0)
+								descent += LineStyle.lineSpacing() - (ls.descent + item->textLayout.line(llp + 1).ascent);
+						}
 						llp++;
 						break;
 					}
@@ -1722,7 +1727,7 @@
 			QRectF scrG;
 			QString oldBack;
 			double oldShade = 100;
-			for (int a = ls.firstItem; a <= ls.lastItem; ++a)
+			for (a = ls.firstItem; a <= ls.lastItem; ++a)
 			{
 				GlyphLayout* glyphs = item->itemText.getGlyphs(a);
 				const CharStyle& charStyle(item->itemText.charStyle(a));