From d82ae3432741dabc748eee85bd652356dbf1841d Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Sat, 30 May 2009 15:12:04 +0000
Subject: [PATCH] misc fixes underlining for hyperlinks

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@980 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
---
 data/formats/fb2/FBReaderVersion.ent          |  2 +-
 platform/android/AndroidManifest.xml          |  2 +-
 platform/android/data/default/styles.xml      |  4 +-
 .../android/fbreader/LibraryTabActivity.java  | 31 ++++++++++++--
 .../android/fbreader/TOCActivity.java         |  8 ++--
 .../android/fbreader/ZLTreeAdapter.java       |  2 -
 .../android/view/ZLAndroidPaintContext.java   |  3 +-
 .../formats/fb2/Base64EncodedImage.java       |  2 +-
 .../formats/xhtml/XHTMLTagItemAction.java     |  2 +-
 .../geometerplus/fbreader/library/Book.java   | 10 +++++
 .../zlibrary/core/tree/ZLTree.java            | 42 ++++++++++++++++++-
 .../zlibrary/core/view/ZLPaintContext.java    | 11 +++--
 .../zlibrary/text/view/ZLTextStyle.java       |  2 +
 .../zlibrary/text/view/ZLTextView.java        | 34 ++++++++++++---
 .../zlibrary/text/view/ZLTextViewBase.java    |  2 +-
 .../text/view/style/ZLTextBaseStyle.java      |  6 +++
 .../text/view/style/ZLTextDecoratedStyle.java | 13 ++++++
 .../view/style/ZLTextFullDecoratedStyle.java  | 11 +++++
 .../view/style/ZLTextFullStyleDecoration.java |  4 +-
 .../style/ZLTextPartialDecoratedStyle.java    | 11 +++++
 .../view/style/ZLTextStyleCollection.java     |  8 ++--
 .../view/style/ZLTextStyleDecoration.java     |  4 +-
 22 files changed, 179 insertions(+), 35 deletions(-)

diff --git a/data/formats/fb2/FBReaderVersion.ent b/data/formats/fb2/FBReaderVersion.ent
index 643f943f3..fc465f1a5 100644
--- a/data/formats/fb2/FBReaderVersion.ent
+++ b/data/formats/fb2/FBReaderVersion.ent
@@ -1 +1 @@
-<!ENTITY FBReaderVersion   "0.5.2">
+<!ENTITY FBReaderVersion   "0.5.3">
diff --git a/platform/android/AndroidManifest.xml b/platform/android/AndroidManifest.xml
index a4945de68..1acc3f9e4 100644
--- a/platform/android/AndroidManifest.xml
+++ b/platform/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="502" android:versionName="0.5.2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.geometerplus.zlibrary.ui.android" android:versionCode="503" android:versionName="0.5.3">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<application android:name="org.geometerplus.zlibrary.ui.android.library.ZLAndroidApplication" android:icon="@drawable/fbreader" android:label="FBReader">
 		<activity android:name="org.geometerplus.android.fbreader.FBReader" android:icon="@drawable/fbreader" android:label="FBReader" android:configChanges="orientation|keyboardHidden">
diff --git a/platform/android/data/default/styles.xml b/platform/android/data/default/styles.xml
index a0ae7f970..1bf7dcff6 100644
--- a/platform/android/data/default/styles.xml
+++ b/platform/android/data/default/styles.xml
@@ -24,8 +24,8 @@
 	<style id="9" name="Preformatted text" italic="true" alignment="left" allowHyphenations="false"/>
 
 	<style id="12" partial="true" name="Cite" italic="true"/>
-	<style id="15" partial="true" name="Internal Hyperlink" allowHyphenations="false" hyperlink="internal"/>
-	<style id="37" partial="true" name="External Hyperlink" allowHyphenations="false" hyperlink="external"/>
+	<style id="15" partial="true" name="Internal Hyperlink" allowHyphenations="false" hyperlink="internal" underline="true"/>
+	<style id="37" partial="true" name="External Hyperlink" allowHyphenations="false" hyperlink="external" underline="true"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-5" vShift="7" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff --git a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java b/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java
index b7fad825f..e2a607724 100644
--- a/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java
+++ b/platform/android/src/org/geometerplus/android/fbreader/LibraryTabActivity.java
@@ -31,6 +31,7 @@ import org.geometerplus.zlibrary.core.options.ZLStringOption;
 import org.geometerplus.zlibrary.core.resources.ZLResource;
 
 import org.geometerplus.fbreader.fbreader.FBReader;
+import org.geometerplus.fbreader.bookmodel.BookModel;
 import org.geometerplus.fbreader.library.*;
 
 public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuItemClickListener {
@@ -38,6 +39,7 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
 
 	final ZLStringOption mySelectedTabOption = new ZLStringOption("TabActivity", "SelectedTab", "");
 	private final ZLResource myResource = ZLResource.resource("libraryView");
+	private Book myCurrentBook;
 
 	private ListView createTab(String tag, int id) {
 		final TabHost host = getTabHost();
@@ -49,6 +51,10 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
+
+		final BookModel model = ((FBReader)FBReader.Instance()).Model;
+		myCurrentBook = (model != null) ? model.Book : null;
+
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 		final TabHost host = getTabHost();
@@ -137,12 +143,32 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
 			super(view, tree);
 			myLibraryTree = tree;
 			myIsFlat = isFlat;
+			if (!isFlat) {
+				selectItem(findFirstSelectedItem());
+			}
+		}
+
+		private ZLTree findFirstSelectedItem() {
+			if (myCurrentBook == null) {
+				return null;
+			}
+			for (LibraryTree tree : myLibraryTree) {
+				if ((tree instanceof BookTree) && ((BookTree)tree).Book.equals(myCurrentBook)) {
+					return tree;
+				}
+			}
+			return null;
 		}
 
 		public View getView(int position, View convertView, ViewGroup parent) {
 			final View view = (convertView != null) ? convertView :
 				LayoutInflater.from(parent.getContext()).inflate(R.layout.library_tree_item, parent, false);
 			final LibraryTree tree = (LibraryTree)getItem(position);
+			if ((tree instanceof BookTree) && ((BookTree)tree).Book.equals(myCurrentBook)) {
+				view.setBackgroundColor(0xff808080);
+			} else {
+				view.setBackgroundColor(0);
+			}
 			final ImageView iconView = (ImageView)view.findViewById(R.id.library_tree_item_icon);
 			if (myIsFlat) {
 				iconView.setVisibility(View.GONE);
@@ -159,10 +185,9 @@ public class LibraryTabActivity extends TabActivity implements MenuItem.OnMenuIt
 				return true;
 			}
 			finish();
-			final FBReader fbreader = (FBReader)FBReader.Instance();
 			final Book book = ((BookTree)tree).Book;
-			if ((fbreader.Model == null) || (fbreader.Model.Book.getId() != book.getId())) {
-				fbreader.openBook(book, null);
+			if (!book.equals(myCurrentBook)) {
+				((FBReader)FBReader.Instance()).openBook(book, null);
 			}
 			return true;
 		}
diff --git a/platform/android/src/org/geometerplus/android/fbreader/TOCActivity.java b/platform/android/src/org/geometerplus/android/fbreader/TOCActivity.java
index 4e8dcd09f..762ad897d 100644
--- a/platform/android/src/org/geometerplus/android/fbreader/TOCActivity.java
+++ b/platform/android/src/org/geometerplus/android/fbreader/TOCActivity.java
@@ -39,6 +39,7 @@ import org.geometerplus.fbreader.fbreader.FBReader;
 
 public class TOCActivity extends ListActivity {
 	private TOCAdapter myAdapter;
+	private ZLTree mySelectedItem;
 
 	@Override
 	public void onCreate(Bundle bundle) {
@@ -54,10 +55,8 @@ public class TOCActivity extends ListActivity {
 			++index;
 		}
 		TOCTree treeToSelect = null;
-		// TODO: use binary search
 		// TODO: process multi-model texts
-		for (int i = 0; i < root.getSize(); ++i) {
-			final TOCTree tree = root.getTree(i);
+		for (TOCTree tree : root) {
 			final TOCTree.Reference reference = tree.getReference();
 			if (reference == null) {
 				continue;
@@ -68,6 +67,7 @@ public class TOCActivity extends ListActivity {
 			treeToSelect = tree;
 		}
 		myAdapter.selectItem(treeToSelect);
+		mySelectedItem = treeToSelect;
 	}
 
 	private static final int PROCESS_TREE_ITEM_ID = 0;
@@ -113,7 +113,7 @@ public class TOCActivity extends ListActivity {
 			final View view = (convertView != null) ? convertView :
 				LayoutInflater.from(parent.getContext()).inflate(R.layout.toc_tree_item, parent, false);
 			final TOCTree tree = (TOCTree)getItem(position);
-			view.setBackgroundColor((tree == SelectedItem) ? 0xff808080 : 0);
+			view.setBackgroundColor((tree == mySelectedItem) ? 0xff808080 : 0);
 			setIcon((ImageView)view.findViewById(R.id.toc_tree_item_icon), tree);
 			((TextView)view.findViewById(R.id.toc_tree_item_text)).setText(tree.getText());
 			return view;
diff --git a/platform/android/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java b/platform/android/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
index 7e15f4ad5..ce5d882b7 100644
--- a/platform/android/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
+++ b/platform/android/src/org/geometerplus/android/fbreader/ZLTreeAdapter.java
@@ -60,9 +60,7 @@ abstract class ZLTreeAdapter extends BaseAdapter implements AdapterView.OnItemCl
 		return myOpenItems.contains(tree);
 	}
 
-	protected ZLTree SelectedItem;
 	public final void selectItem(ZLTree tree) {
-		SelectedItem = tree;
 		if (tree == null) {
 			return;
 		}
diff --git a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
index bb1cfb702..9e723c727 100644
--- a/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
+++ b/platform/android/src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidPaintContext.java
@@ -105,7 +105,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 		myCanvas.drawRect(0, 0, myWidth + myScrollbarWidth, myHeight, Paint);
 	}
 
-	protected void setFontInternal(String family, int size, boolean bold, boolean italic) {
+	protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline) {
 		final int style = (bold ? Typeface.BOLD : 0) | (italic ? Typeface.ITALIC : 0);
 		final Paint paint = Paint;
 		Typeface[] typefaces = myTypefaces.get(family);
@@ -120,6 +120,7 @@ public final class ZLAndroidPaintContext extends ZLPaintContext {
 		}
 		paint.setTypeface(typeface);
 		paint.setTextSize(size);
+		paint.setUnderlineText(underline);
 	}
 
 	public void setColor(ZLColor color, int style) {
diff --git a/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java b/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java
index db2345857..02df73f96 100644
--- a/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java
+++ b/src/org/geometerplus/fbreader/formats/fb2/Base64EncodedImage.java
@@ -107,7 +107,7 @@ final class Base64EncodedImage extends ZLSingleImage {
 		inputStream.close();
 		file.delete();
 
-		final byte[] data = new byte[dataLength * 3 / 4 + 1];
+		final byte[] data = new byte[dataLength * 3 / 4 + 4];
 		int dataPos = 0;
 		for (int pos = 0; pos < dataLength; ) {
 			byte n0 = -1, n1 = -1, n2 = -1, n3 = -1;
diff --git a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java
index 221583e91..d36a2d813 100644
--- a/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java
+++ b/src/org/geometerplus/fbreader/formats/xhtml/XHTMLTagItemAction.java
@@ -24,7 +24,7 @@ import org.geometerplus.zlibrary.core.xml.ZLStringMap;
 import org.geometerplus.fbreader.bookmodel.BookReader;
 
 class XHTMLTagItemAction extends XHTMLTagAction {
-	private final char[] BULLET = { '\u2022' };
+	private final char[] BULLET = { '\u2022', '\240' };
 
 	protected void doAtStart(XHTMLReader reader, ZLStringMap xmlattributes) {
 		final BookReader modelReader = reader.getModelReader();
diff --git a/src/org/geometerplus/fbreader/library/Book.java b/src/org/geometerplus/fbreader/library/Book.java
index ffe829491..9a8f4ce0e 100644
--- a/src/org/geometerplus/fbreader/library/Book.java
+++ b/src/org/geometerplus/fbreader/library/Book.java
@@ -336,4 +336,14 @@ public class Book {
 			BooksDatabase.Instance().storePosition(myId, position);
 		}
 	}
+
+	@Override
+	public int hashCode() {
+		return (int)myId;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		return (o instanceof Book) && (myId == ((Book)o).myId);
+	}
 }
diff --git a/src/org/geometerplus/zlibrary/core/tree/ZLTree.java b/src/org/geometerplus/zlibrary/core/tree/ZLTree.java
index f75445dd3..6bf355af4 100644
--- a/src/org/geometerplus/zlibrary/core/tree/ZLTree.java
+++ b/src/org/geometerplus/zlibrary/core/tree/ZLTree.java
@@ -21,7 +21,7 @@ package org.geometerplus.zlibrary.core.tree;
 
 import java.util.*;
 
-public abstract class ZLTree<T extends ZLTree> {
+public abstract class ZLTree<T extends ZLTree> implements Iterable<T> {
 	private int mySize = 1;
 	public final T Parent;
 	public final int Level;
@@ -90,4 +90,44 @@ public abstract class ZLTree<T extends ZLTree> {
 		mySubTrees = null;
 		mySize = 1;
 	}
+
+	public final Iterator<T> iterator() {
+		return new TreeIterator();
+	}
+
+	private class TreeIterator implements Iterator<T> {
+		private T myCurrentElement = (T)ZLTree.this;
+		private final LinkedList<Integer> myIndexStack = new LinkedList<Integer>();
+
+		public boolean hasNext() {
+			return myCurrentElement != null;
+		}
+
+		public T next() {
+			final T element = myCurrentElement;
+			if (element.hasChildren()) {
+				myCurrentElement = (T)element.mySubTrees.get(0);
+				myIndexStack.add(0);
+			} else {
+				ZLTree<T> parent = element;
+				while (!myIndexStack.isEmpty()) {
+					final int index = myIndexStack.removeLast() + 1;
+					parent = parent.Parent;
+					if (parent.mySubTrees.size() > index) {
+						myCurrentElement = parent.mySubTrees.get(index);
+						myIndexStack.add(index);
+						break;
+					}
+				}
+				if (myIndexStack.isEmpty()) {
+					myCurrentElement = null;
+				}
+			}
+			return element;
+		}
+
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+	}
 }
diff --git a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
index 08e530c0d..d7dadeae9 100644
--- a/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
+++ b/src/org/geometerplus/zlibrary/core/view/ZLPaintContext.java
@@ -47,12 +47,13 @@ abstract public class ZLPaintContext {
 	private int myFontSize;
 	private boolean myFontIsBold;
 	private boolean myFontIsItalic;
+	private boolean myFontIsUnderlined;
 
 	public final void resetFont() {
 		myResetFont = true;
 	}
 
-	public final void setFont(String family, int size, boolean bold, boolean italic) {
+	public final void setFont(String family, int size, boolean bold, boolean italic, boolean underline) {
 		if ((family != null) && !myFontFamily.equals(family)) {
 			myFontFamily = family;
 			myResetFont = true;
@@ -69,16 +70,20 @@ abstract public class ZLPaintContext {
 			myFontIsItalic = italic;
 			myResetFont = true;
 		}
+		if (myFontIsUnderlined != underline) {
+			myFontIsUnderlined = underline;
+			myResetFont = true;
+		}
 		if (myResetFont) {
 			myResetFont = false;
-			setFontInternal(myFontFamily, myFontSize, myFontIsBold, myFontIsItalic);
+			setFontInternal(myFontFamily, size, bold, italic, underline);
 			mySpaceWidth = -1;
 			myStringHeight = -1;
 			myDescent = -1;
 		}
 	}
 
-	abstract protected void setFontInternal(String family, int size, boolean bold, boolean italic);
+	abstract protected void setFontInternal(String family, int size, boolean bold, boolean italic, boolean underline);
 
 	final public void setColor(ZLColor color) {
 		setColor(color, LineStyle.SOLID_LINE);
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
index 3f139d3c3..63b8871a0 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextStyle.java
@@ -29,6 +29,8 @@ public interface ZLTextStyle {
 
 	boolean isBold();
 	boolean isItalic();
+	boolean isUnderline();
+
 	int getLeftIndent();
 	int getRightIndent();
 	int getFirstLineIndentDelta();
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
index 2a8b22ca9..e3a00abf4 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextView.java
@@ -387,6 +387,7 @@ public abstract class ZLTextView extends ZLTextViewBase {
 		return sizeOfText;
 	}
 
+	private static final char[] SPACE = new char[] { ' ' };
 	private void drawTextLine(ZLTextPage page, ZLTextLineInfo info, int from, int to, int y) {
 		final ZLTextParagraphCursor paragraph = info.ParagraphCursor;
 		final ZLPaintContext context = Context;
@@ -449,10 +450,12 @@ public abstract class ZLTextView extends ZLTextViewBase {
 		int index = from;
 		final int endElementIndex = info.EndElementIndex;
 		int charIndex = info.RealStartCharIndex;
-		for (int wordIndex = info.RealStartElementIndex; wordIndex != endElementIndex; ++wordIndex, charIndex = 0) {
+		for (int wordIndex = info.RealStartElementIndex; (wordIndex != endElementIndex) && (index < to); ++wordIndex, charIndex = 0) {
 			final ZLTextElement element = paragraph.getElement(wordIndex);
-			if ((element instanceof ZLTextWord) || (element instanceof ZLTextImageElement)) {
-				final ZLTextElementArea area = page.TextElementMap.get(index++);
+			final ZLTextElementArea area = page.TextElementMap.get(index);
+			//if ((element instanceof ZLTextWord) || (element instanceof ZLTextImageElement)) {
+			if (element == area.Element) {
+				index++;
 				if (area.ChangeStyle) {
 					setTextStyle(area.Style);
 				}
@@ -460,8 +463,13 @@ public abstract class ZLTextView extends ZLTextViewBase {
 				final int areaY = area.YEnd - getElementDescent(element) - getTextStyle().getVerticalShift();
 				if (element instanceof ZLTextWord) {
 					drawWord(areaX, areaY, (ZLTextWord)element, charIndex, -1, false);
-				} else {
+				} else if (element instanceof ZLTextImageElement) {
 					context.drawImage(areaX, areaY, ((ZLTextImageElement)element).ImageData);
+				} else if (element == ZLTextElement.HSpace) {
+					final int cw = context.getSpaceWidth();
+					for (int len = 0; len < area.XEnd - area.XStart; len += cw) {
+						context.drawString(areaX + len, areaY, SPACE, 0, 1);
+					}
 				}
 			}
 		}
@@ -722,13 +730,23 @@ public abstract class ZLTextView extends ZLTextViewBase {
 		final int paragraphIndex = paragraph.Index;
 		final int endElementIndex = info.EndElementIndex;
 		int charIndex = info.RealStartCharIndex;
+		ZLTextElementArea spaceElement = null;
 		for (int wordIndex = info.RealStartElementIndex; wordIndex != endElementIndex; ++wordIndex, charIndex = 0) {
 			final ZLTextElement element = paragraph.getElement(wordIndex);
 			final int width = getElementWidth(element, charIndex);
 			if (element == ZLTextElement.HSpace) {
 				if (wordOccurred && (spaceCounter > 0)) {
-					int correction = fullCorrection / spaceCounter;
-					x += context.getSpaceWidth() + correction;
+					final int correction = fullCorrection / spaceCounter;
+					final int spaceLength = context.getSpaceWidth() + correction;
+					if (getTextStyle().isUnderline()) {
+						spaceElement = new ZLTextElementArea(
+							paragraphIndex, wordIndex, 0, 
+							0, false, false, getTextStyle(), element, x, x + spaceLength, y, y
+						);
+					} else {
+						spaceElement = null;
+					}
+					x += spaceLength;
 					fullCorrection -= correction;
 					wordOccurred = false;
 					--spaceCounter;
@@ -737,6 +755,10 @@ public abstract class ZLTextView extends ZLTextViewBase {
 				final int height = getElementHeight(element);
 				final int descent = getElementDescent(element);
 				final int length = (element instanceof ZLTextWord) ? ((ZLTextWord)element).Length : 0;
+				if (spaceElement != null) {
+					page.TextElementMap.add(spaceElement);
+					spaceElement = null;
+				}
 				page.TextElementMap.add(new ZLTextElementArea(paragraphIndex, wordIndex, charIndex, 
 					length - charIndex, false, changeStyle, getTextStyle(), element, x, x + width - 1, y - height + 1, y + descent));
 				changeStyle = false;
diff --git a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
index 6f5485d52..2693758c9 100644
--- a/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
+++ b/src/org/geometerplus/zlibrary/text/view/ZLTextViewBase.java
@@ -64,7 +64,7 @@ abstract class ZLTextViewBase extends ZLView {
 			myTextStyle = style;
 			myWordHeight = -1;
 		}
-		Context.setFont(style.getFontFamily(), style.getFontSize(), style.isBold(), style.isItalic());
+		Context.setFont(style.getFontFamily(), style.getFontSize(), style.isBold(), style.isItalic(), style.isUnderline());
 	}
 
 	final void resetTextStyle() {
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
index 85dd9baa3..f2e7ba730 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextBaseStyle.java
@@ -50,6 +50,8 @@ public class ZLTextBaseStyle implements ZLTextStyle {
 		new ZLBooleanOption(GROUP, "Base:bold", false);
 	public final ZLBooleanOption ItalicOption =
 		new ZLBooleanOption(GROUP, "Base:italic", false);
+	public final ZLBooleanOption UnderlineOption =
+		new ZLBooleanOption(GROUP, "Base:underline", false);
 	public final ZLIntegerOption AlignmentOption =
 		new ZLIntegerOption(GROUP, "Base:alignment", ZLTextAlignmentType.ALIGN_JUSTIFY);
 	public final ZLIntegerOption LineSpacePercentOption =
@@ -83,6 +85,10 @@ public class ZLTextBaseStyle implements ZLTextStyle {
 		return ItalicOption.getValue();
 	}
 
+	public boolean isUnderline() {
+		return UnderlineOption.getValue();
+	}
+
 	public int getLeftIndent() {
 		return 0;
 	}
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
index 02647f4f9..70c427a6f 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextDecoratedStyle.java
@@ -82,6 +82,19 @@ public abstract class ZLTextDecoratedStyle {
 	}
 	protected abstract boolean isBoldInternal();
 
+	private boolean myIsUnderline;
+	private boolean myIsUnderlineCached;
+	public final boolean isUnderline() {
+		if (myIsUnderlineCached) {
+			return myIsUnderline;
+		}
+		final boolean answer = isUnderlineInternal();
+		myIsUnderline = answer;
+		myIsUnderlineCached = true;
+		return answer;
+	}
+	protected abstract boolean isUnderlineInternal();
+
 	private int myVerticalShift;
 	private boolean myVerticalShiftCached;
 	public final int getVerticalShift() {
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java
index b0d3b7f7f..e8bb03ffe 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullDecoratedStyle.java
@@ -76,6 +76,17 @@ public class ZLTextFullDecoratedStyle extends ZLTextDecoratedStyle implements ZL
 		}
 	}
 
+	protected boolean isUnderlineInternal() {
+		switch (myDecoration.UnderlineOption.getValue()) {
+			case ZLBoolean3.B3_TRUE:
+				return true;
+			case ZLBoolean3.B3_FALSE:
+				return false;
+			default:
+				return getBase().isUnderline();
+		}
+	}
+
 	public int getLeftIndent() {
 		return getBase().getLeftIndent() + myDecoration.LeftIndentOption.getValue();
 	}
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java
index ae2f9876f..a41c543d0 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextFullStyleDecoration.java
@@ -37,8 +37,8 @@ public class ZLTextFullStyleDecoration extends ZLTextStyleDecoration {
 
 	public final ZLIntegerOption LineSpacePercentOption;
 
-	public ZLTextFullStyleDecoration(String name, int fontSizeDelta, int bold, int italic, int spaceBefore, int spaceAfter, int leftIndent,int rightIndent, int firstLineIndentDelta, int verticalShift, byte alignment, int lineSpace, int allowHyphenations) {
-		super(name, fontSizeDelta, bold, italic, verticalShift, allowHyphenations);
+	public ZLTextFullStyleDecoration(String name, int fontSizeDelta, int bold, int italic, int underline, int spaceBefore, int spaceAfter, int leftIndent,int rightIndent, int firstLineIndentDelta, int verticalShift, byte alignment, int lineSpace, int allowHyphenations) {
+		super(name, fontSizeDelta, bold, italic, underline, verticalShift, allowHyphenations);
 		SpaceBeforeOption = new ZLIntegerRangeOption(STYLE, name + ":spaceBefore", -10, 100, spaceBefore);
 		SpaceAfterOption = new ZLIntegerRangeOption(STYLE, name + ":spaceAfter", -10, 100, spaceAfter);
 		LeftIndentOption = new ZLIntegerRangeOption(STYLE, name + ":leftIndent", -300, 300, leftIndent);
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java
index 3dbeab9eb..38b443fa2 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextPartialDecoratedStyle.java
@@ -77,6 +77,17 @@ class ZLTextPartialDecoratedStyle extends ZLTextDecoratedStyle implements ZLText
 		}
 	}
 
+	protected boolean isUnderlineInternal() {
+		switch (myDecoration.UnderlineOption.getValue()) {
+			case ZLBoolean3.B3_TRUE:
+				return true;
+			case ZLBoolean3.B3_FALSE:
+				return false;
+			default:
+				return getBase().isUnderline();
+		}
+	}
+
 	public int getLeftIndent() {
 		return getBase().getLeftIndent();
 	}
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
index f1663e237..79c9a0132 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleCollection.java
@@ -34,9 +34,6 @@ public class ZLTextStyleCollection {
 	
 	private ZLTextStyleCollection() {
 		new TextStyleReader(this).read(ZLResourceFile.createResourceFile("data/default/styles.xml"));
-		if (myBaseStyle == null) {
-			myBaseStyle = new ZLTextBaseStyle("", 20);
-		}
 	}
 	
 	public static ZLTextStyleCollection Instance() {
@@ -110,6 +107,7 @@ public class ZLTextStyleCollection {
 					int fontSizeDelta = intValue(attributes, "fontSizeDelta", 0);
 					int bold = b3Value(attributes, "bold");
 					int italic = b3Value(attributes, "italic");
+					int underline = b3Value(attributes, "underline");
 					int verticalShift = intValue(attributes, "vShift", 0);
 					int allowHyphenations = b3Value(attributes, "allowHyphenations");
 					byte hyperlinkStyle = HyperlinkStyle.NONE;
@@ -124,7 +122,7 @@ public class ZLTextStyleCollection {
 					}
 
 					if (booleanValue(attributes, "partial")) {
-						decoration = new ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, verticalShift, allowHyphenations);
+						decoration = new ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, underline, verticalShift, allowHyphenations);
 					} else {
 						int spaceBefore = intValue(attributes, "spaceBefore", 0);
 						int spaceAfter = intValue(attributes, "spaceAfter", 0);
@@ -147,7 +145,7 @@ public class ZLTextStyleCollection {
 						}
 						final int lineSpacePercent = intValue(attributes, "lineSpacingPercent", -1);
 
-						decoration = new ZLTextFullStyleDecoration(name, fontSizeDelta, bold, italic, spaceBefore, spaceAfter, leftIndent, rightIndent, firstLineIndentDelta, verticalShift, alignment, lineSpacePercent, allowHyphenations);
+						decoration = new ZLTextFullStyleDecoration(name, fontSizeDelta, bold, italic, underline, spaceBefore, spaceAfter, leftIndent, rightIndent, firstLineIndentDelta, verticalShift, alignment, lineSpacePercent, allowHyphenations);
 					}
 					decoration.setHyperlinkStyle(hyperlinkStyle);
 
diff --git a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java
index 1e5752d01..21adeff87 100644
--- a/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java
+++ b/src/org/geometerplus/zlibrary/text/view/style/ZLTextStyleDecoration.java
@@ -31,18 +31,20 @@ public class ZLTextStyleDecoration {
 	public final ZLIntegerRangeOption FontSizeDeltaOption;
 	public final ZLBoolean3Option BoldOption;
 	public final ZLBoolean3Option ItalicOption;
+	public final ZLBoolean3Option UnderlineOption;
 	public final ZLIntegerOption VerticalShiftOption;
 	public final ZLBoolean3Option AllowHyphenationsOption;
 
 	private final String myName;
 	private byte myHyperlinkStyle;
 
-	public ZLTextStyleDecoration(String name, int fontSizeDelta, int bold, int italic, int verticalShift, int allowHyphenations) {
+	public ZLTextStyleDecoration(String name, int fontSizeDelta, int bold, int italic, int underline, int verticalShift, int allowHyphenations) {
 		myName = name;
 		FontFamilyOption = new ZLStringOption(STYLE, name + ":fontFamily", "");
 		FontSizeDeltaOption = new ZLIntegerRangeOption(STYLE, name + ":fontSize", -16, 16, fontSizeDelta);
 		BoldOption = new ZLBoolean3Option(STYLE, name + ":bold", bold);
 		ItalicOption = new ZLBoolean3Option(STYLE, name + ":italic", italic);
+		UnderlineOption = new ZLBoolean3Option(STYLE, name + ":underline", underline);
 		VerticalShiftOption = new ZLIntegerOption(STYLE, name + ":vShift", verticalShift);
 		AllowHyphenationsOption = new ZLBoolean3Option(STYLE, name + ":allowHyphenations", allowHyphenations);
 	}