Fix CJK line Breaking #162
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if((itemText.text(currentIndex -1) != SpecialChars::CJK_NOBREAK_AFTER) && | ||
| (itemText.text(currentIndex) != SpecialChars::CJK_NOBREAK_BEFORE)) | ||
| current.rememberBreak(i-1, breakPos, style.rightMargin()); | ||
|
|
There was a problem hiding this comment.
currentIndex is the glyph cluster index not story text index, you should use current.glyphs[currentIndex - 1].lastChar() and current.glyphs[currentIndex].firstChar(). and make sure i is not zero.
Fahad-Alsaidi
force-pushed
the
cjkLineBreak
branch
from
c49a457
to
bd4f5ef
Compare
|
updated! |
| @@ -2178,6 +2178,12 @@ void PageItem_TextFrame::layout() | |||
| // remember possible break | |||
| if (i + 1 < glyphRuns.count() && glyphRuns[i + 1].hasFlag(ScLayout_LineBoundry)) | |||
| { | |||
|
|
|||
| if( current.glyphs.length() > 1 && (current.glyphs[currentIndex -1].lastChar() != SpecialChars::CJK_NOBREAK_AFTER) && | |||
There was a problem hiding this comment.
The space should be before the opening bracket, also there should be spaces around both sides of the minus operator.
Fahad-Alsaidi
force-pushed
the
cjkLineBreak
branch
from
bd4f5ef
to
3ccfd06
Compare
This mimic the old stlye in line breaking though we should find a better solution for line breaking in general.
Fahad-Alsaidi
force-pushed
the
cjkLineBreak
branch
from
3ccfd06
to
d4fc95d
Compare
|
updated! |
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This mimic the old stlye in line breaking though we should find a better solution for line breaking in general.