aboutsummaryrefslogtreecommitdiff
path: root/dw/textblock_linebreaking.cc
diff options
context:
space:
mode:
authorSebastian Geerken <devnull@localhost>2012-11-28 12:54:36 +0100
committerSebastian Geerken <devnull@localhost>2012-11-28 12:54:36 +0100
commit90ca861dcdc37266b51f645951448f3757aeb80f (patch)
tree44c5f66ceeef56fbd53e3b969348b4025bfce665 /dw/textblock_linebreaking.cc
parent69d1b0097e8991679ec3c0df1eea149ae41b27c9 (diff)
parentc3457db125316fe83f9a6c714ac1dd76e70b581c (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 cbfd4fa7..63d482ee 100644
--- a/dw/textblock_linebreaking.cc
+++ b/dw/textblock_linebreaking.cc
@@ -706,7 +706,8 @@ int Textblock::hyphenateWord (int wordIndex)
penalties[PENALTY_HYPHEN][1]);
// "\xe2\x80\x90" is an unconditional hyphen.
w->hyphenWidth =
- layout->textWidth (origWord.style->font, "\xe2\x80\x90", 3);
+ layout->textWidth (w->style->font, hyphenDrawChar,
+ strlen (hyphenDrawChar));
w->flags |= (Word::DRAW_AS_ONE_TEXT | Word::DIV_CHAR_AT_EOL |
Word::UNBREAKABLE_FOR_MIN_WIDTH);