yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

fixed NBSPACE processing

Browse source
This commit is contained in:
Nikolay Pultsin 2015-08-15 23:47:40 +02:00
parent 2553ca4e9c
commit e672bf6892
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
View file

@ -158,6 +158,7 @@ public final class ZLTextParagraphCursor {
if (index > 0 && spaceState == NO_SPACE) { if (index > 0 && spaceState == NO_SPACE) {
addWord(data, offset + wordStart, index - wordStart, myOffset + wordStart, hyperlink); addWord(data, offset + wordStart, index - wordStart, myOffset + wordStart, hyperlink);
} }
elements.add(nbSpace);
if (spaceState != SPACE) { if (spaceState != SPACE) {
spaceState = NON_BREAKABLE_SPACE; spaceState = NON_BREAKABLE_SPACE;
} }
@ -170,7 +171,6 @@ public final class ZLTextParagraphCursor {
wordStart = index; wordStart = index;
break; break;
case NON_BREAKABLE_SPACE: case NON_BREAKABLE_SPACE:
elements.add(nbSpace);
wordStart = index; wordStart = index;
break; break;
case NO_SPACE: case NO_SPACE:

3
src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
View file

@ -227,7 +227,8 @@ abstract class ZLTextViewBase extends ZLView {
} }
final int getElementHeight(ZLTextElement element) { final int getElementHeight(ZLTextElement element) {
if (element instanceof ZLTextWord || if (element == ZLTextElement.NBSpace ||
element instanceof ZLTextWord ||
element instanceof ZLTextFixedHSpaceElement) { element instanceof ZLTextFixedHSpaceElement) {
return getWordHeight(); return getWordHeight();
} else if (element instanceof ZLTextImageElement) { } else if (element instanceof ZLTextImageElement) {