r21149 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Apr  1 18:03:14 2016
New Revision: 21149

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21149
Log:
Revert previous commit: does not work well with drop caps

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21149&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Fri Apr  1 18:03:14 2016
@@ -1382,13 +1382,6 @@
 		if (itemText.hasObject(a))
 			gl.xadvance = itemText.object(a)->width() + itemText.object(a)->lineWidth();
 
-		if (a == 0 || itemText.text(a - 1) == SpecialChars::PARSEP)
-		{
-			ParagraphStyle style = itemText.paragraphStyle(a);
-			if (style.hasBullet() || style.hasNum())
-				gl.xadvance += style.parEffectOffset();
-		}
-
 		run.glyphs().append(gl);
 
 		glyphRuns.append(run);
@@ -1716,7 +1709,7 @@
 					continue;
 				}
 				else
-					glyphRuns[i].clearFlag(ScLayout_SuppressSpace);
+					itemText.clearFlag(a, ScLayout_SuppressSpace);
 			}
 			else // from 134 on use NBSPACE for this effect
 			{
@@ -1727,7 +1720,7 @@
 					continue;
 				}
 				else
-					glyphRuns[i].clearFlag(ScLayout_SuppressSpace);
+					itemText.clearFlag(a, ScLayout_SuppressSpace);
 			}
 			if (current.isEmpty)
 			{
@@ -2643,6 +2636,7 @@
 			if ((DropCmode || BulNumMode) && !outs)
 			{
 				current.xPos += style.parEffectOffset();
+				lastGlyph.xadvance += style.parEffectOffset();
 				if (DropCmode)
 				{
 					DropCmode = false;