diff options
| -rw-r--r-- | dw/textblock.cc | 12 | ||||
| -rw-r--r-- | dw/textblock.hh | 7 |
2 files changed, 18 insertions, 1 deletions
diff --git a/dw/textblock.cc b/dw/textblock.cc index 769263aa..99a6f0d3 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -851,6 +851,11 @@ void Textblock::decorateText(core::View *view, core::style::Style *style, /* * Draw a string of text + * + * Arguments: ... "isStart" and "isEnd" are true, when the text + * start/end represents the start/end of a "real" text word (before + * hyphenation). This has an effect on text transformation. ("isEnd" + * is not used yet, but here for symmetry.) */ void Textblock::drawText(core::View *view, core::style::Style *style, core::style::Color::Shading shading, int x, int y, @@ -871,6 +876,9 @@ void Textblock::drawText(core::View *view, core::style::Style *style, str = layout->textToLower(text + start, len); break; case core::style::TEXT_TRANSFORM_CAPITALIZE: + // If "isStart" is false, the first letter of "text" is + // not the first letter of the "real" text word, so no + // transformation is necessary. if (isStart) { /* \bug No way to know about non-ASCII punctuation. */ bool initial_seen = false; @@ -1363,6 +1371,8 @@ void Textblock::fillWord (Word *word, int width, int ascent, int descent, /* * Get the width of a string of text. + * + * For "isStart" and "isEnd" see drawText. */ int Textblock::textWidth(const char *text, int start, int len, core::style::Style *style, bool isStart, bool isEnd) @@ -1423,6 +1433,8 @@ int Textblock::textWidth(const char *text, int start, int len, /** * Calculate the size of a text word. + * + * For "isStart" and "isEnd" see textWidth and drawText. */ void Textblock::calcTextSize (const char *text, size_t len, core::style::Style *style, diff --git a/dw/textblock.hh b/dw/textblock.hh index d3b158d2..b0360fb6 100644 --- a/dw/textblock.hh +++ b/dw/textblock.hh @@ -309,8 +309,13 @@ protected: * do not consider this word as breakable. This flag is * ignored when the line is actually broken. */ UNBREAKABLE_FOR_MIN_WIDTH = 1 << 4, - + /* If a word represents a "real" text word, or (after + * hyphenation) the first part of a "real" text word, this + * flag is set. Plays a role for text transformation. */ WORD_START = 1 << 5, + /* If a word represents a "real" text word, or (after + * hyphenation) the last part of a "real" text word, this + * flag is set. Analogue to WORD_START. */ WORD_END = 1 << 6 }; |