diff options
| -rw-r--r-- | doc/dw-line-breaking.doc | 2 | ||||
| -rw-r--r-- | dw/textblock.hh | 4 | ||||
| -rw-r--r-- | dw/textblock_linebreaking.cc | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/dw-line-breaking.doc b/doc/dw-line-breaking.doc index 913ae14e..ed6e573d 100644 --- a/doc/dw-line-breaking.doc +++ b/doc/dw-line-breaking.doc @@ -252,7 +252,7 @@ possible ways of hyphenation: ABCD, ABC-D, AB-CD, AB-C-D, A-BCD, A-BC-D, A-B-CD, A-B-C-D. (Some of them, like the last one, are only probable for very narrow lines.) -Let w(A), w(B), W(C), W(D) be the word widths (part of +Let w(A), w(B), w(C), w(D) be the word widths (part of dw::Textblock::Word::size), which have to be calculated, and l be a shorthand for of dw::core::Platform::textWidth. Without considering this problem, the calculatin would be simple: w(A) = l(A) diff --git a/dw/textblock.hh b/dw/textblock.hh index 141ad09b..eb6dfddd 100644 --- a/dw/textblock.hh +++ b/dw/textblock.hh @@ -457,8 +457,8 @@ protected: bool sendSelectionEvent (core::SelectionState::EventType eventType, core::MousePositionEvent *event); - void accumulateWordExtremees (int firstWord, int lastWord, - int *maxOfMinWidth, int *sumOfMaxWidth); + void accumulateWordExtremes (int firstWord, int lastWord, + int *maxOfMinWidth, int *sumOfMaxWidth); virtual void wordWrap (int wordIndex, bool wrapAll); int hyphenateWord (int wordIndex); void accumulateWordForLine (int lineIndex, int wordIndex); diff --git a/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc index e69b58fb..7559f38e 100644 --- a/dw/textblock_linebreaking.cc +++ b/dw/textblock_linebreaking.cc @@ -297,8 +297,8 @@ Textblock::Line *Textblock::addLine (int firstWord, int lastWord, // Word::totalWidth includes the hyphen (which is what we want here). int lineWidth = lastWordOfLine->totalWidth; int maxOfMinWidth, sumOfMaxWidth; - accumulateWordExtremees (firstWord, lastWord, &maxOfMinWidth, - &sumOfMaxWidth); + accumulateWordExtremes (firstWord, lastWord, &maxOfMinWidth, + &sumOfMaxWidth); PRINTF (" words[%d]->totalWidth = %d\n", lastWord, lastWordOfLine->totalWidth); @@ -403,8 +403,8 @@ Textblock::Line *Textblock::addLine (int firstWord, int lastWord, return line; } -void Textblock::accumulateWordExtremees (int firstWord, int lastWord, - int *maxOfMinWidth, int *sumOfMaxWidth) +void Textblock::accumulateWordExtremes (int firstWord, int lastWord, + int *maxOfMinWidth, int *sumOfMaxWidth) { int parMin = 0; *maxOfMinWidth = *sumOfMaxWidth = 0; |