From e672bf6892a6e4ce3552f9c110dd9a41ed8eff44 Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 15 Aug 2015 23:47:40 +0200
Subject: [PATCH] fixed NBSPACE processing

---
 .../geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java | 2 +-
 src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java b/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
index 74dd777ff..6715533dd 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
@@ -158,6 +158,7 @@ public final class ZLTextParagraphCursor {
 						if (index > 0 && spaceState == NO_SPACE) {
 							addWord(data, offset + wordStart, index - wordStart, myOffset + wordStart, hyperlink);
 						}
+						elements.add(nbSpace);
 						if (spaceState != SPACE) {
 							spaceState = NON_BREAKABLE_SPACE;
 						}
@@ -170,7 +171,6 @@ public final class ZLTextParagraphCursor {
 								wordStart = index;
 								break;
 							case NON_BREAKABLE_SPACE:
-								elements.add(nbSpace);
 								wordStart = index;
 								break;
 							case NO_SPACE:
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
index e178cacfb..e1243c4f4 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
@@ -227,7 +227,8 @@ abstract class ZLTextViewBase extends ZLView {
 	}
 
 	final int getElementHeight(ZLTextElement element) {
-		if (element instanceof ZLTextWord ||
+		if (element == ZLTextElement.NBSpace ||
+			element instanceof ZLTextWord ||
 			element instanceof ZLTextFixedHSpaceElement) {
 			return getWordHeight();
 		} else if (element instanceof ZLTextImageElement) {