aboutsummaryrefslogtreecommitdiff
path: root/dw/textblock_linebreaking.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2012-11-27 16:05:54 +0100
committerSebastian Geerken <devnull@localhost>2012-11-27 16:05:54 +0100
commit6526b42cefc35149af20d645f15e8bb76b0db0e2 (patch)
treecc4b9874540709435da9657501eae1db77038d99 /dw/textblock_linebreaking.cc
parent1250d68c8767232849145d9e6abe681a562f6f5d (diff)
parentc58af8aa171908de5e0e069754803235f8ea70f8 (diff)
Merge.
Diffstat (limited to 'dw/textblock_linebreaking.cc')
-rw-r--r--dw/textblock_linebreaking.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc
index a1682e19..cbfd4fa7 100644
--- a/dw/textblock_linebreaking.cc
+++ b/dw/textblock_linebreaking.cc
@@ -704,8 +704,9 @@ int Textblock::hyphenateWord (int wordIndex)
// TODO There should be a method fillHyphen.
w->badnessAndPenalty.setPenalties (penalties[PENALTY_HYPHEN][0],
penalties[PENALTY_HYPHEN][1]);
+ // "\xe2\x80\x90" is an unconditional hyphen.
w->hyphenWidth =
- layout->textWidth (origWord.style->font, "\xc2\xad", 2);
+ layout->textWidth (origWord.style->font, "\xe2\x80\x90", 3);
w->flags |= (Word::DRAW_AS_ONE_TEXT | Word::DIV_CHAR_AT_EOL |
Word::UNBREAKABLE_FOR_MIN_WIDTH);