r22189 by jghali -

[scribus-commit]

Author: jghali
Date: Sun Oct  8 15:58:42 2017
New Revision: 22189

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22189
Log:
#15014: "Non breaking space" does not work well

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22189&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sun Oct  8 15:58:42 2017
@@ -2249,7 +2249,8 @@
 				const GlyphCluster& nextCluster = glyphClusters[i + 1];
 				if (nextCluster.hasFlag(ScLayout_LineBoundary))
 				{
-					if (!current.glyphs[currentIndex].hasFlag(ScLayout_HyphenationPossible)
+					if (!current.glyphs[currentIndex].hasFlag(ScLayout_LineBoundary)
+						&& !current.glyphs[currentIndex].hasFlag(ScLayout_HyphenationPossible)
 						&& (itemText.text(a) != '-')
 						&& (itemText.text(a) != SpecialChars::SHYPHEN))
 					{