Fixed handling of breaks for spaces.

3 files changed, 7 insertions, 5 deletions

diff --git a/dw/textblock.cc b/dw/textblock.cc
index 0bd6a407..590ffb60 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -2483,7 +2483,7 @@ void Textblock::setBreakOption (Word *word, core::style::Style *style,
    // TODO: lineMustBeBroken should be independent of the penalty
    // index? Otherwise, examine the last line.
    if (!word->badnessAndPenalty.lineMustBeBroken(0)) {
-      if (forceBreak || isBreakAllowed (word))
+      if (forceBreak || isBreakAllowed (style))
          word->badnessAndPenalty.setPenalties (breakPenalty1, breakPenalty2);
       else
          word->badnessAndPenalty.setPenalty (PENALTY_PROHIBIT_BREAK);
@@ -2492,9 +2492,9 @@ void Textblock::setBreakOption (Word *word, core::style::Style *style,
    DBG_OBJ_MSG_END ();
 }
 
-bool Textblock::isBreakAllowed (Word *word)
+bool Textblock::isBreakAllowed (core::style::Style *style)
 {
-   switch (word->style->whiteSpace) {
+   switch (style->whiteSpace) {
    case core::style::WHITE_SPACE_NORMAL:
    case core::style::WHITE_SPACE_PRE_LINE:
    case core::style::WHITE_SPACE_PRE_WRAP:
diff --git a/dw/textblock.hh b/dw/textblock.hh
index 7b2028d8..41762557 100644
--- a/dw/textblock.hh
+++ b/dw/textblock.hh
@@ -608,7 +608,9 @@ protected:
    void fillSpace (int wordNo, core::style::Style *style);
    void setBreakOption (Word *word, core::style::Style *style,
                         int breakPenalty1, int breakPenalty2, bool forceBreak);
-   bool isBreakAllowed (Word *word);
+   bool isBreakAllowedInWord (Word *word)
+   { return isBreakAllowed (word->style); }
+   bool isBreakAllowed (core::style::Style *style);
    int textWidth (const char *text, int start, int len,
                   core::style::Style *style, bool isStart, bool isEnd);
    void calcTextSize (const char *text, size_t len, core::style::Style *style,
diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc
index 8b99ed1f..3f1101c0 100644
--- a/dw/textblock_linebreaking.cc
+++ b/dw/textblock_linebreaking.cc
@@ -1147,7 +1147,7 @@ bool Textblock::isHyphenationCandidate (Word *word)
 {
    return (word->flags & Word::CAN_BE_HYPHENATED) &&
       word->style->x_lang[0] &&
-      isBreakAllowed(word) &&
+      isBreakAllowedInWord (word) &&
       word->content.type == core::Content::TEXT &&
       Hyphenator::isHyphenationCandidate (word->content.text);
 }