r18239 by jghali - #11250: Drop caps aren't correctly applied

[scribus-commit]

Author: jghali
Date: Thu Apr 11 13:29:04 2013
New Revision: 18239

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18239
Log:
#11250: Drop caps aren't correctly applied

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18239&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Thu Apr 11 13:29:04 2013
@@ -2762,15 +2762,18 @@
 				if (inOverflow)
 					current.xPos = realEnd;
 
-				//line break or end of column
-				if (( hl->ch == SpecialChars::PARSEP || hl->ch == SpecialChars::LINEBREAK)
-				    && current.hasDropCap)
+				// line break and drop caps
+				// #11250: in case of a forced line break, we must not stop
+				// the drop cap layout process. This break case such as 
+				// layout of poetry.
+				if (hl->ch == SpecialChars::PARSEP && current.hasDropCap)
 				{
 					current.hasDropCap = false;
 					if (current.yPos < maxDY)
 						current.yPos = maxDY;
 					maxDX = 0;
 				}
+				// end of column
 				if (current.isEndOfCol(desc))
 				{
 					//check if realy line extends bottom margin