r20618 by jghali -

[scribus-commit]

Author: jghali
Date: Sat Dec 12 13:58:07 2015
New Revision: 20618

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20618
Log:
#12565: Right alignment of hyphens

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20618&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Sat Dec 12 13:58:07 2015
@@ -2778,8 +2778,17 @@
 						// Justification
 						if (opticalMargins & ParagraphStyle::OM_RightHangingPunct)
 							current.line.width += opticalRightMargin(itemText, current.line);
-						else
-							current.line.naturalWidth += hyphWidth;
+						// #12565: Right alignment of hyphens
+						// The additional character width has already been taken into account
+						// above via the line break position, so it's not necessary to increase
+						// the line natural width again:
+						// line 2604: breakPos = current.xPos;
+						// line 2605: if (currentCh != '-')
+						// line 2606: {
+						// line 2607: 	breakPos += hyphWidth;
+						// line 2608: }
+						/*else
+							current.line.naturalWidth += hyphWidth;*/
 
 						OFs = 0;
 						if (style.alignment() == ParagraphStyle::Rightaligned)