diff -Nru fbreader-0.8.17/build_packages.sh fbreader-0.10.7dfsg/build_packages.sh
--- fbreader-0.8.17/build_packages.sh	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/build_packages.sh	2009-04-30 22:26:45.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/bash
 
 version=`cat fbreader/VERSION`
 tmpdir=fbreader-$version
@@ -14,11 +14,13 @@
 	prepare_nonGPL=false
 fi
 
-if [ $# != 1 ]; then
+if [ $# -lt 1 ]; then
 	echo "usage:"
 	echo "  $0 [-non-GPL] <architecture>"
 	echo "or"
 	echo "  $0 [-non-GPL] all"
+	echo "or"
+	echo "  $0 [-non-GPL] supported"
 	echo ""
 	echo "available architectures are:"
 	for pkgtype in $distdir/*; do
@@ -31,12 +33,15 @@
 
 create_tmpdir() {
 	mkdir $tmpdir
-	cp -r Makefile build_packages.sh zlibrary fbreader makefiles README.build $distdir $tmpdir
+	cp -r Makefile build_packages.sh zlibrary fbreader makefiles README.build distributions distributions-nonGPL $tmpdir
 	rm -rf `find $tmpdir -name ".svn"`
 	make -C $tmpdir distclean 1> /dev/null 2>&1
 
 	if [ "$prepare_nonGPL" == "true" ]; then
 		pushd $tmpdir > /dev/null;
+		echo -en "Removing Arabic localization... ";
+		rm -rf fbreader/data/resources/ar.xml zlibrary/core/data/resources/ar.xml fbreader/data/help/MiniHelp.*.ar.fb2;
+		echo OK;
 		echo -en "Removing Finnish localization... ";
 		rm -rf fbreader/data/resources/fi.xml zlibrary/core/data/resources/fi.xml fbreader/data/help/MiniHelp.*.fi.fb2;
 		echo OK;
@@ -50,7 +55,7 @@
 		zip -dq zlibrary/text/data/hyphenationPatterns.zip id.pattern;
 		echo OK;
 		echo -en "Removing Qt-based interface... ";
-		rm -rf zlibrary/ui/src/qt zlibrary/ui/src/qt4
+		rm -rf zlibrary/ui/src/opie zlibrary/ui/src/qtopia zlibrary/ui/src/qt zlibrary/ui/src/qt4
 		echo OK;
 		popd > /dev/null;
 	fi;
@@ -70,7 +75,7 @@
 					/scratchbox/login sb-conf se SDK_ARM
 					/scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2
 					;;
-				maemo2)
+				maemo2|maemo3)
 					/scratchbox/login sb-conf se SDK_ARMEL
 					/scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2
 					;;
@@ -78,31 +83,35 @@
 					/scratchbox/login sb-conf se CHINOOK_ARMEL
 					/scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2
 					;;
+				maemo5)
+					/scratchbox/login sb-conf se FREMANTLE_X86
+					/scratchbox/login -d `pwd` $make_package ARCHITECTURE=$1 $2
+					;;
 				*)
 					$make_package ARCHITECTURE=$1 $2
 					;;
 			esac;
-			mkdirhier $pkgdir/$1
+			mkdir -p $pkgdir/$1
 			mv -f $tmpdir/*.deb $tmpdir/*.dsc $tmpdir/*.changes $tmpdir/*.tar.gz $pkgdir/$1
 			;;
 		ipk|debipk)
 			$make_package ARCHITECTURE=$1 $2
-			mkdirhier $pkgdir/$1
+			mkdir -p $pkgdir/$1
 			mv -f $tmpdir/*.ipk $pkgdir/$1
 			;;
 		motopkg)
 			$make_package ARCHITECTURE=$1 $2
-			mkdirhier $pkgdir/$1
+			mkdir -p $pkgdir/$1
 			mv -f $tmpdir/*.pkg $pkgdir/$1
 			;;
 		tarball)
 			$make_package ARCHITECTURE=$1 $2
-			mkdirhier $pkgdir/$1
+			mkdir -p $pkgdir/$1
 			mv -f $tmpdir/*.tgz $pkgdir/$1
 			;;
 		nsi)
 			$make_package ARCHITECTURE=$1 $2
-			mkdirhier $pkgdir/$1
+			mkdir -p $pkgdir/$1
 			mv -f $tmpdir/*.exe $pkgdir/$1
 			;;
 		*)
@@ -119,16 +128,29 @@
 		done;
 	done;
 	remove_tmpdir
+elif [ $1 == supported ]; then
+	create_tmpdir
+	build_package desktop debian
+	build_package maemo2 debian
+	build_package maemo3 debian
+	build_package maemo4 debian
+	build_package win32 nsi
+	build_package desktop tarball
+	build_package source tarball
+	remove_tmpdir
 else
-	archtype=`echo $1 | cut -d "-" -f 1`;
-	pkgtype=`echo $1 | cut -d "-" -f 2`;
-	extra=`echo $1 | cut -d "-" -f 3`;
-
-	if [ "$pkgtype" != "" -a "$extra" == "" -a -d $distdir/$pkgtype/$archtype ]; then
-		create_tmpdir
-		build_package $archtype $pkgtype
-		remove_tmpdir
-	else 
-		echo "unknown architecture: $1"
-	fi;
+	while [ $# -gt 0 ] ; do
+		archtype=`echo $1 | cut -d "-" -f 1`;
+		pkgtype=`echo $1 | cut -d "-" -f 2`;
+		extra=`echo $1 | cut -d "-" -f 3`;
+
+		if [ "$pkgtype" != "" -a "$extra" == "" -a -d $distdir/$pkgtype/$archtype ]; then
+			create_tmpdir
+			build_package $archtype $pkgtype
+			remove_tmpdir
+		else 
+			echo "unknown architecture: $1"
+		fi;
+		shift;
+	done;
 fi;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/changelog /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/changelog
--- fbreader-0.8.17/debian/changelog	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/changelog	2009-05-16 15:24:11.000000000 +0100
@@ -1,3 +1,144 @@
+fbreader (0.10.7dfsg-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add a substvars hack to pull in libzlui-maemo on lpia, and libzlui 
+      otherwise.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sat, 16 May 2009 19:40:25 +0530
+
+fbreader (0.10.7dfsg-1) unstable; urgency=low
+
+  * New upstream release, some changes:
+    - 0.10.7:
+      - A conflict between hyperlink clicks and touch scrolling has
+        been fixed.
+      - In maemo versions, empty menu items have been hidden.
+    - 0.10.6:
+      - A bug with images/css links in epub has been fixed. All the links
+        inside XHTML files were interpreted relative to the root OPF location
+        instead of XHTML file location. As a result, some images were not shown
+        in epub books.
+    - 0.10.5:
+      - The migration tool from version 0.8.* has been fixed. After an upgrade
+        from 0.8.* to this version, the first opening of your library will take
+        some time.
+      - A freeze (on some PDB books with more than one page and images, and
+        using small font size) has been fixed.
+      - Several text selection related issues have been fixed.
+    - 0.10.4:
+      - Maemo support is back.
+      - Multiple fixes in the epub format support.
+  * debian/control:
+    - Re-introduced libzlui-maemo binary package.
+    - Different minor versions of the same ui packages ('libzlui-*') are
+      incompatible between each other but have the same name, and it can cause
+      problems on upgrades. This is not a reliable behavior, so now
+      'libzlui-*' packages don't provide 'libzlui' virtual package anymore.
+      Binary package 'fbreader' now strictly depends on same or newer binary
+      versions of one of 'libzlui-*' packages. (Closes: #521136)
+    - Bumped 'Standards-Version' to 3.8.1, no changes needed.
+  * debian/rules:
+    - Uncommented building maemo binaries.
+  * debian/dfsg-repack:
+    - Corrected to output usage when the parameter is not given.
+  * debian/patches:
+    - 005-maemo-makefile.patch: refreshed.
+    - New 020-maemo-disable-libconic.patch: disable libconic-related parts of
+      the maemo UI. Libconic depends on closed source, not even available
+      software.
+    - New 200-maemo-gtkentryparameter.patch: remove tuning-only hildon calls
+      that Debian GTK+ libraries cannot (yet?) satisfy.
+    - 930-use-shell-make-variable.patch: refreshed.
+    - debian/patches/940-use-debian-compiler-flags.patch: refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 01 May 2009 00:28:06 +0300
+
+fbreader (0.10.3dfsg-1) experimental; urgency=low
+
+  * New upstream release, some changes:
+    - 0.10.3:
+      - Some issues related to multi-file tar, tar.gz and tar.bz2 archives
+        have been fixed.
+    - 0.10.2:
+      - Images order in mobipocket files has been corrected.
+      - Indonesian localization files have been updated.
+  * debian/dfsg-repack:
+    - Corrected to produce correct orig.tar.gz.
+  * debian/patches:
+    - 005-maemo-makefile.patch:
+      - Refreshed.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Fri, 27 Feb 2009 21:26:25 +0200
+
+fbreader (0.10.1dfsg-1) experimental; urgency=low
+
+  * Repacked upstream tarball, removed non-DFSG hyphenation patterns (el, fi,
+    tr languages). See also README.source.
+  * debian/README.source:
+    - Added with reasons of excluding hyphenation patterns from upstream
+      tarball.
+  * debian/copyright:
+    - Renewed copyrights, thanks to Frank Lichtenheld.
+    - Fixed GPLv2 license path on Debian systems.
+    - Mentioned all Debian packaging contributors.
+    - Provided full license and copyright info for hyphenation patterns.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Wed, 04 Feb 2009 22:59:58 +0200
+
+fbreader (0.10.1-1) experimental; urgency=low
+
+  * New upstream release, some changes:
+    - Fixed never-ending loop under certain conditions when operating with
+      library and settings.
+  * debian/patches:
+    - 200-typo-in-searchonnetworkaction.patch: removed, went upstream.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Sun, 18 Jan 2009 16:06:20 +0200
+
+fbreader (0.10.0-1) experimental; urgency=low
+
+  * New upstream release, some changes:
+    - Searching and downloading books from www.feedbooks.com and
+      www.litres.ru.
+    - Partial CSS support for Epub files.
+    - Improved support for Epub and Mobipocket book formats.
+    - Added support for right-to-left languages and bidirectional text.
+    - Added Czech localization.
+  * debian/rules:
+    - Removed some old dh_makeshlibs magic for libzlcore and libzltext.
+    - Temporarily removed libzlui-maemo binary package until maemo support is
+      ready.
+    - Added build-deps: libfribidi-dev, libcurl4-gnutls-dev.
+  * debian/control:
+    - Bumped liblinebreak dependency version to 1.0.
+    - Made qt4 interface for fbreader the default one for new installs.
+    - Updated library binary package names '0.9' -> '0.10'.
+    - Removed some obsolete Conflicts and Replaces for libzlcore0.10 and
+      libzltext0.10.
+    - As GTK2 UI cannot substitute fonts, added Suggests on 'ttf-unifont'
+      for libzlui-gtk package. (Closes: #502040)
+    - Wrote up better short descriptions, modified a bit long description
+      for libzltext0.10. (Closes: #493616)
+    - Improved long description for the libzlcore-data package.
+    - Advanced fbreader long description according to new release.
+    - Added {misc:Depends} to Depends of all packages, fixing lintian
+      warnings.
+    - Removed duplicated 'Priority' fields from binary packages' entries.
+    - Divided architecture-independent data from package libzltext0.10 to its
+      own binary package (liblztext-data) as it leads to conflict problems
+      being in library package along .so files.
+    - Set DM-Upload-Allowed flag.
+  * debian/patches:
+    - 010-add-missing-headers.patch: deleted, went upstream.
+    - 100-fix-centering-with-margins.patch: deleted, went upstream.
+    - 910-remove-deprecated-fields-in-desktop-file.patch: deleted, went
+      upstream.
+    - New 200-typo-in-searchonnetworkaction.patch, cherry-picked from
+      upstream.
+    - Added comments to all Debian patches.
+
+ -- Eugene V. Lyubimkin <jackyf.devel@gmail.com>  Tue, 13 Jan 2009 22:19:32 +0200
+
 fbreader (0.8.17-12ubuntu1) jaunty; urgency=low
 
   * Merge from debian unstable, remaining changes (LP: #317726):
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/control /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/control
--- fbreader-0.8.17/debian/control	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/control	2009-05-16 15:24:11.000000000 +0100
@@ -3,15 +3,20 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Eugene V. Lyubimkin <jackyf.devel@gmail.com>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev, libhildon-1-dev, libosso-dev, liblinebreak-dev (>= 0.9.6-3), quilt (>= 0.24)
+DM-Upload-Allowed: yes
+Standards-Version: 3.8.1
+Build-Depends: debhelper (>= 7), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev,
+  libexpat1-dev, libbz2-dev, libz-dev, libhildon-1-dev, libosso-dev,
+  liblinebreak-dev (>= 1.0), libfribidi-dev, libcurl4-gnutls-dev,
+  quilt (>= 0.24)
 Homepage: http://www.fbreader.org/
 
 Package: fbreader
-Priority: optional
 Architecture: any
 Replaces: fbreader-gtk, fbreader-qt, fbreader-qt4
-Depends: ${shlibs:Depends}, ${libzlui:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+  libzlui-qt4 (>= ${binary:Version}) | libzlui-gtk (>= ${binary:Version}) |
+  libzlui-qt3 (>= ${binary:Version}) | libzlui-maemo (>= ${binary:Version})
 Description: e-book reader
  FBReader is an e-book reader.
  .
@@ -27,15 +32,15 @@
   * keeps the last open book and the last read positions for all open books
     between runs
   * automatic hyphenation (patterns for several languages are included)
+  * searching and downloading books from www.feedbooks.com and www.litres.ru
+  * partial CSS support for epub files
 
-Package: libzlcore0.9
+Package: libzlcore0.10
 Section: libs
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore-data (>= ${binary:Version})
-Conflicts: fbreader-gtk, fbreader-qt, fbreader-qt4, libzlcore (<< 0.8.17-12)
-Replaces: libzlcore (<< 0.8.17-12)
-Description: ZLibrary core
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore-data (>= ${binary:Version})
+Conflicts: fbreader-gtk, fbreader-qt, fbreader-qt4
+Description: ZLibrary cross-platform development library (shared library)
  This is the core of ZLibrary, the library that the fbreader e-book reader
  is based on.
  .
@@ -44,36 +49,47 @@
 
 Package: libzlcore-data
 Section: libs
-Priority: optional
 Architecture: all
+Depends: ${misc:Depends}
 Conflicts: libzlcore (<< 0.8.17-12)
 Replaces: libzlcore (<< 0.8.17-12)
-Description: ZLibrary core
- This is the core of ZLibrary, the library that the fbreader e-book reader
- is based on.
+Description: ZLibrary cross-platform development library (support files)
+ This package contains the support files for the core of ZLibrary, the library
+ that the fbreader e-book reader is based on.
  .
  ZLibrary is a cross-platform library to build applications running on desktop
  Linux, Windows, different Linux-based PDAs using this library.
 
-Package: libzltext0.9
+Package: libzltext0.10
 Section: libs
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore0.9 (= ${binary:Version})
-Conflicts: libzltext (<< 0.8.17-12)
-Replaces: libzltext (<< 0.8.17-12)
-Description: ZLibrary text model/viewer
- This package provides text model/viewer part of ZLibrary.
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.10 (= ${binary:Version}),
+  libzltext-data (>= ${binary:Version})
+Description: ZLibrary text model/viewer part (shared library)
+ This package provides text model/viewer part of ZLibrary. See also 
+ libzlcore0.10 package.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
+
+Package: libzltext-data
+Section: libs
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: libzltext, libzltext0.9
+Replaces: libzltext, libzltext0.9
+Description: ZLibrary text model/viewer part (support files)
+ This package contains the support files for the text model/viewer part
+ of ZLibrary. See also libzltext0.10 package.
  .
  ZLibrary is a cross-platform library to build applications running on desktop
  Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzlui-gtk
 Section: libs
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore0.9 (= ${binary:Version})
-Provides: libzlui
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.10 (= ${binary:Version})
+Suggests: ttf-unifont
 Description: GTK+ interface module for ZLibrary
  This package provides a GTK+-based UI for ZLibrary.
  .
@@ -82,10 +98,8 @@
 
 Package: libzlui-qt
 Section: libs
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore0.9 (= ${binary:Version})
-Provides: libzlui
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.10 (= ${binary:Version})
 Description: Qt3 interface module for ZLibrary
  This package provides a Qt3-based UI for ZLibrary.
  .
@@ -94,10 +108,8 @@
 
 Package: libzlui-qt4
 Section: libs
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore0.9 (= ${binary:Version})
-Provides: libzlui
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.10 (= ${binary:Version})
 Description: Qt4 interface module for ZLibrary
  This package provides a Qt4-based UI for ZLibrary.
  .
@@ -108,8 +120,7 @@
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore0.9 (= ${binary:Version})
-Provides: libzlui
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.10 (= ${binary:Version})
 Description: Maemo interface module for ZLibrary
  This package provides a maemo-based UI for ZLibrary.
  .
@@ -118,10 +129,9 @@
 
 Package: libzlcore-dev
 Section: libdevel
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore0.9 (= ${binary:Version})
-Description: ZLibrary core - development files
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.10 (= ${binary:Version})
+Description: ZLibrary cross-platform development library (development files)
  This package contains development files for the ZLibrary core.
  .
  ZLibrary is a cross-platform library to build applications running on desktop
@@ -129,10 +139,9 @@
 
 Package: libzltext-dev
 Section: libdevel
-Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzltext0.9 (= ${binary:Version})
-Description: ZLibrary text model/viewer - development files
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzltext0.10 (= ${binary:Version})
+Description: ZLibrary text model/viewer part (development files)
  This package contains development files for the ZLibrary text model/viewer
  library.
  .
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/copyright /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/copyright
--- fbreader-0.8.17/debian/copyright	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/copyright	2009-05-16 15:24:11.000000000 +0100
@@ -1,6 +1,9 @@
 This is the Debian prepackaged version of FBReader.
 
-It was originally Debianised by Nikolay Pultsin <geometer@fbreader.org>.
+It was originally Debianised by Nikolay Pultsin <geometer@fbreader.org>, and
+later modified and improved by Joey Hess <joeyh@debian.org> and
+Eugene V. Lyubimkin <jackyf.devel@gmail.com>.
+
 Sources are downloaded from its website at:
 
 	http://www.fbreader.org/
@@ -8,7 +11,7 @@
 It is copyright as follows:
 
 /*
- * Copyright (C) 2004-2008 Nikolay Pultsin <geometer@mawhrin.net>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,10 +29,12 @@
  * 02110-1301, USA.
  */
 
-On Debian systems, the full text of the GPL can be found in 
-/usr/share/common-licenses/GPL
+On Debian systems, the full text of the GPLv2 can be found in 
+/usr/share/common-licenses/GPL-2.
+
 
-It also includes html entity files with these licenses:
+Html entity files (fbreader/data/formats/docbook/*.ent) with
+these licenses:
 
 <!-- Portions (C) International Organization for Standardization 1986
      Permission to copy in any form is granted for use with
@@ -49,3 +54,540 @@
      expressed or implied warranty.
 
 -->
+
+
+Hyphenation patterns (zlibrary/text/data/hyphenationPatterns.zip):
+
+Files fi.pattern, tr.pattern, el.pattern were removed from upstream tarball.
+Check README.source to see why. You can reproduce removing procedure by using
+script debian/dfsg-repack.
+
+
+Files: cs.pattern
+License: GPLv2+.
+
+Files: en.pattern
+License: specific (follows)
+
+% Unlimited copying and redistribution of this file are permitted as long
+% as this file is not modified. Modifications are permitted, but only if
+% the resulting file is not named hyphen.tex.
+
+Files: de-traditional.pattern
+License: Latex Project Public License 1+
+Copyrights:
+
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+%               [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+%               [macros, adaption for TeX 2]
+%
+
+Files: de.pattern
+License: Latex Project Public License 1+
+Copyrights:
+
+% Copyright (C) 1988,1991 Rechenzentrum der Ruhr-Universitaet Bochum
+%               [german hyphen patterns]
+% Copyright (C) 1993,1994,1999 Bernd Raichle/DANTE e.V.
+%               [macros, adaption for TeX 2]
+% Copyright (C) 1998-2001 Walter Schmidt
+%               [adaption to new German orthography]
+%
+
+Files: eo.pattern
+License: Latex Project Public License 1+
+Copyrights: Copyright (C) 1999 Sergei B. Pokrovsky <pok@iis.nsk.su>
+
+Files: es.pattern
+License: Latex Project Public License
+Copyrights:
+
+% (c) Javier Bezos 1993 1997.
+% (c) Javier Bezos and CervanTeX 2001-2006
+% Some parts, (c) by Francesc Carmona
+
+Files: fr.pattern
+License: specific (follows)
+
+% This file is available for free and can used and redistributed
+% asis for free. Modified versions should have another name.
+
+Files: id.pattern
+License: GPLv2
+Copyrights: (c) Copyright 1996, 1997 J\"org Knappen and Terry Mart
+
+Files: it.pattern
+License: LGPLv2.1+
+Copyrights: Copyright  1998, 2007 Claudio Beccari
+
+Files: no.pattern:
+Copyrights: Copyright (C) 2004, 2005 Rune Kleveland, Ole Michael Selberg.
+License: specific (follows)
+
+% Copying and distribution of this file, with or without modification,
+% are permitted in any medium without royalty provided the copyright
+% notice and this notice are preserved.
+
+Files: pt.pattern:
+License: Latex Project Public License 1+
+Copyrights:
+
+% (C) 1996 by  Pedro J. de Rezende (rezende@dcc.unicamp.br)
+%          and J.Joao Dias Almeida (jj@di.uminho.pt)
+% Version: 1.2 Release date: 21/07/96
+%
+% (C) 1994 by Pedro J. de Rezende (rezende@dcc.unicamp.br)
+% Version: 1.1 Release date: 04/12/94
+%
+% (C) 1987 by Pedro J. de Rezende
+% Version: 1.0 Release date: 02/13/87
+
+Files: sv.pattern
+License: Latex Project Public License 1.2+
+Copyrights: Copyright 1994 by Jan Michael Rynning. All rights reserved.
+
+Files: uk.pattern
+License: Latex Project Public License 1+
+Copyrights: Copyright 1999 Andrij Shvaika
+
+Files: ru.pattern
+License: Latex Project Public License 1.2+
+Copyrights: Copyright 1999-2003 Alexander I. Lebedev <swan@scon155.phys.msu.su>
+
+
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c  2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+    Everyone is allowed to distribute verbatim copies of this
+    license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute.  This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but 
+it is written in such a way that you can use it even if your work is 
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work.  If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+   `Work'
+    Any work being distributed under this License.
+    
+   `Derived Work'
+    Any work that under any applicable law is derived from the Work.
+
+   `Modification' 
+    Any procedure that produces a Derived Work under any applicable
+    law -- for example, the production of a file containing an
+    original file associated with the Work or a significant portion of
+    such a file, either verbatim or with modifications and/or
+    translated into another language.
+
+   `Modify'
+    To apply any procedure that produces a Derived Work under any
+    applicable law.
+    
+   `Distribution'
+    Making copies of the Work available from one person to another, in
+    whole or in part.  Distribution includes (but is not limited to)
+    making any electronic components of the Work accessible by
+    file transfer protocols such as FTP or HTTP or by shared file
+    systems such as Sun's Network File System (NFS).
+
+   `Compiled Work'
+    A version of the Work that has been processed into a form where it
+    is directly usable on a computer system.  This processing may
+    include using installation facilities provided by the Work,
+    transformations of the Work, copying of components of the Work, or
+    other activities.  Note that modification of any installation
+    facilities provided by the Work constitutes modification of the Work.
+
+   `Current Maintainer'
+    A person or persons nominated as such within the Work.  If there is
+    no such explicit nomination then it is the `Copyright Holder' under
+    any applicable law.
+
+   `Base Interpreter' 
+    A program or process that is normally needed for running or
+    interpreting a part or the whole of the Work.    
+
+    A Base Interpreter may depend on external components but these
+    are not considered part of the Base Interpreter provided that each
+    external component clearly identifies itself whenever it is used
+    interactively.  Unless explicitly specified when applying the
+    license to the Work, the only applicable Base Interpreter is a
+    `LaTeX-Format' or in the case of files belonging to the 
+    `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1.  Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope.  In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2.  You may distribute a complete, unmodified copy of the Work as you
+received it.  Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3.  You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4.  If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work.  You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work.  Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5.  If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6.  If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition.  Only
+the Current Maintainer is allowed to add such statements of exemption 
+to a component of the Work. 
+
+  a. If a component of this Derived Work can be a direct replacement
+     for a component of the Work when that component is used with the
+     Base Interpreter, then, wherever this component of the Work
+     identifies itself to the user when used interactively with that
+     Base Interpreter, the replacement component of this Derived Work
+     clearly and unambiguously identifies itself as a modified version
+     of this component to the user when used interactively with that
+     Base Interpreter.
+     
+  b. Every component of the Derived Work contains prominent notices
+     detailing the nature of the changes to that component, or a
+     prominent reference to another file that is distributed as part
+     of the Derived Work and that contains a complete and accurate log
+     of the changes.
+  
+  c. No information in the Derived Work implies that any persons,
+     including (but not limited to) the authors of the original version
+     of the Work, provide any support, including (but not limited to)
+     the reporting and handling of errors, to recipients of the
+     Derived Work unless those persons have stated explicitly that
+     they do provide such support for the Derived Work.
+
+  d. You distribute at least one of the following with the Derived Work:
+
+       1. A complete, unmodified copy of the Work; 
+          if your distribution of a modified component is made by
+          offering access to copy the modified component from a
+          designated place, then offering equivalent access to copy
+          the Work from the same or some similar place meets this
+          condition, even though third parties are not compelled to
+          copy the Work along with the modified component;
+
+       2. Information that is sufficient to obtain a complete,
+          unmodified copy of the Work.
+
+7.  If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8.  The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9.  Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+     
+10. a. A Derived Work may be distributed under a different license
+       provided that license itself honors the conditions listed in
+       Clause 6 above, in regard to the Work, though it does not have
+       to honor the rest of the conditions in this license.
+      
+    b. If a Derived Work is distributed under a different license, that
+       Derived Work must provide sufficient documentation as part of
+       itself to allow each recipient of that Derived Work to honor the 
+       restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12.  Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work.  Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose.  The entire risk as to the quality and performance
+of the Work is with you.  Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1.  Make a reasonable attempt to trace the Current Maintainer (and
+     the Copyright Holder, if the two differ) through the means of
+     an Internet or similar search.
+
+ 2.  If this search is successful, then enquire whether the Work
+     is still maintained.
+
+  a. If it is being maintained, then ask the Current Maintainer
+     to update their communication data within one month.
+     
+  b. If the search is unsuccessful or no action to resume active
+     maintenance is taken by the Current Maintainer, then announce
+     within the pertinent community your intention to take over
+     maintenance.  (If the Work is a LaTeX work, this could be
+     done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+     maintenance of the Work to you, then this takes effect
+     immediately upon announcement.
+     
+  b. If the Current Maintainer is not reachable and the Copyright
+     Holder agrees that maintenance of the Work be passed to you,
+     then this takes effect immediately upon announcement.  
+    
+ 4.  If you make an `intention announcement' as described in 2b. above
+     and after three months your intention is challenged neither by
+     the Current Maintainer nor by the Copyright Holder nor by other
+     people, then you may arrange for the Work to be changed so as
+     to name you as the (new) Current Maintainer.
+     
+ 5.  If the previously unreachable Current Maintainer becomes
+     reachable once more within three months of a change completed
+     under the terms of 3b) or 4), then that Current Maintainer must
+     become or remain the Current Maintainer upon request provided
+     they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer.  You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license.  These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license.  You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license.  It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate.  Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component.  While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community.  It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one.  Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified.  Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+  %% pig.dtx
+  %% Copyright 2005 M. Y. Name
+  %
+  % This work may be distributed and/or modified under the
+  % conditions of the LaTeX Project Public License, either version 1.3
+  % of this license or (at your option) any later version.
+  % The latest version of this license is in
+  %   http://www.latex-project.org/lppl.txt
+  % and version 1.3 or later is part of all distributions of LaTeX
+  % version 2005/12/01 or later.
+  %
+  % This work has the LPPL maintenance status `maintained'.
+  % 
+  % The Current Maintainer of this work is M. Y. Name.
+  %
+  % This work consists of the files pig.dtx and pig.ins
+  % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.  
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+   The LPPL requires that distributions of the Work contain all the
+   files of the Work.  It is therefore important that you provide a
+   way for the licensee to determine which files constitute the Work.
+   This could, for example, be achieved by explicitly listing all the
+   files of the Work near the copyright notice of each file or by
+   using a line such as:
+
+    % This work consists of all files listed in manifest.txt.
+   
+   in that place.  In the absence of an unequivocal list it might be
+   impossible for the licensee to determine what is considered by you
+   to comprise the Work and, in such a case, the licensee would be
+   entitled to make reasonable conjectures as to which files comprise
+   the Work.
+
+
+LGPLv2.1 clause:
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+On Debian systems, the full text of the LGPLv2.1 can be found in
+/usr/share/common-licenses/LGPL-2.1.
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/dfsg-repack /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/dfsg-repack
--- fbreader-0.8.17/debian/dfsg-repack	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/dfsg-repack	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+# This script removes non-dfsg files from upstream tarball.
+# Requires package 'zip' to be installed
+
+ORIG_TARBALL=$1
+if [ -z $ORIG_TARBALL ]; then
+	echo "Usage: $0 <path to tarball>"
+	exit 1
+fi
+ZIP_FILE=zlibrary/text/data/hyphenationPatterns.zip
+
+REPACK_DIR=./tmp-fbreader-repack
+mkdir -p $REPACK_DIR
+
+tar -C $REPACK_DIR -xzf $ORIG_TARBALL
+UPSTREAM_DIR=`ls -1 $REPACK_DIR/`; \
+(cd $REPACK_DIR && \
+	zip -d $UPSTREAM_DIR/$ZIP_FILE "el.pattern" "fi.pattern" "tr.pattern"; \
+	mv $UPSTREAM_DIR ${UPSTREAM_DIR}.orig;
+)
+
+tar -C $REPACK_DIR -cf - ${UPSTREAM_DIR}.orig |
+	gzip --best -c > $ORIG_TARBALL.dfsg
+
+rm -r $REPACK_DIR
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/libzlcore0.10.dirs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/libzlcore0.10.dirs
--- fbreader-0.8.17/debian/libzlcore0.10.dirs	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/libzlcore0.10.dirs	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1 @@
+usr/lib
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/libzlcore0.9.dirs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/libzlcore0.9.dirs
--- fbreader-0.8.17/debian/libzlcore0.9.dirs	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/libzlcore0.9.dirs	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/libzltext0.10.dirs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/libzltext0.10.dirs
--- fbreader-0.8.17/debian/libzltext0.10.dirs	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/libzltext0.10.dirs	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1 @@
+usr/lib
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/libzltext-data.dirs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/libzltext-data.dirs
--- fbreader-0.8.17/debian/libzltext-data.dirs	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/libzltext-data.dirs	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1 @@
+usr/share/zlibrary
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/005-maemo-makefile.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/005-maemo-makefile.patch
--- fbreader-0.8.17/debian/patches/005-maemo-makefile.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/005-maemo-makefile.patch	2009-05-16 15:24:11.000000000 +0100
@@ -1,11 +1,14 @@
---- fbreader-0.8.17.orig/makefiles/arch/maemo.mk
-+++ fbreader-0.8.17/makefiles/arch/maemo.mk
-@@ -13,7 +13,7 @@
- 
- LD = g++
- ifeq "$(UI_TYPE)" "maemo4"
+Removes '-mthumb' from CFLAGS.
+Index: fbreader/makefiles/arch/maemo.mk
+===================================================================
+--- fbreader.orig/makefiles/arch/maemo.mk	2009-03-29 18:28:31.030047755 +0300
++++ fbreader/makefiles/arch/maemo.mk	2009-03-29 18:28:55.138987438 +0300
+@@ -17,7 +17,7 @@
+ 	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
+ 	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic
+ else ifeq "$(UI_TYPE)" "maemo4"
 -	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -mthumb -DMAEMO_VERSION=4
 +	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -DMAEMO_VERSION=4
- 	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
- 	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0
- else # ifeq "$(UI_TYPE)" "maemo2"
+ 	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
+ 	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic
+ else # ifeq "$(UI_TYPE)" "maemo2/3"
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/010-add-missing-headers.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/010-add-missing-headers.patch
--- fbreader-0.8.17/debian/patches/010-add-missing-headers.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/010-add-missing-headers.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- fbreader-0.8.17.orig/zlibrary/ui/src/maemo/library/ZLibrary.cpp
-+++ fbreader-0.8.17/zlibrary/ui/src/maemo/library/ZLibrary.cpp
-@@ -18,6 +18,7 @@
-  */
- 
- #include <gtk/gtk.h>
-+#include <stdlib.h>
- 
- #include <ZLApplication.h>
- #include <ZLibrary.h>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/020-maemo-disable-libconic.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/020-maemo-disable-libconic.patch
--- fbreader-0.8.17/debian/patches/020-maemo-disable-libconic.patch	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/020-maemo-disable-libconic.patch	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1,55 @@
+Disable the code related to libconic, we have no change to build libconic library.
+Index: fbreader/zlibrary/ui/Makefile
+===================================================================
+--- fbreader.orig/zlibrary/ui/Makefile	2009-05-01 00:00:58.003796550 +0300
++++ fbreader/zlibrary/ui/Makefile	2009-05-01 00:07:57.354811621 +0300
+@@ -57,10 +57,6 @@
+   GTKSUBDIRS = src/gtk/time src/maemo/dialogs src/maemo/optionView src/maemo/view src/gtk/image src/gtk/util src/maemo/application src/maemo/library src/gtk/filesystem src/maemo/message src/gtk/pixbuf
+ endif
+ 
+-ifeq "<$(UI_TYPE)>" "$(findstring <$(UI_TYPE)>, <maemo3> <maemo4> <maemo5>)"
+-  GTKSUBDIRS += src/maemo/network
+-endif
+-
+ ifeq "$(UI_TYPE)" "win32"
+   SUBDIRS += src/win32/view src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/library src/win32/time src/win32/message
+ endif
+Index: fbreader/zlibrary/ui/src/maemo/library/ZLibrary.cpp
+===================================================================
+--- fbreader.orig/zlibrary/ui/src/maemo/library/ZLibrary.cpp	2009-05-01 00:06:48.826806384 +0300
++++ fbreader/zlibrary/ui/src/maemo/library/ZLibrary.cpp	2009-05-01 00:07:01.958794310 +0300
+@@ -36,9 +36,6 @@
+ #include "../message/ZLMaemoMessage.h"
+ #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
+ #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
+-#if MAEMO_VERSION > 2
+-#include "../network/ZLMaemoNetworkManager.h"
+-#endif
+ 
+ class ZLGtkLibraryImplementation : public ZLibraryImplementation {
+ 
+@@ -63,9 +60,6 @@
+ 	ZLGtkDialogManager::createInstance();
+ 	ZLMaemoCommunicationManager::createInstance();
+ 	ZLGtkImageManager::createInstance();
+-#if MAEMO_VERSION > 2
+-	ZLMaemoNetworkManager::createInstance();
+-#endif
+ 
+ 	if (!ZLFile("/usr/lib/more-gconv").directory(false).isNull()) {
+ 		setenv("GCONV_PATH", "/usr/lib/more-gconv", 1);
+Index: fbreader/makefiles/arch/maemo.mk
+===================================================================
+--- fbreader.orig/makefiles/arch/maemo.mk	2009-05-01 00:09:04.522799669 +0300
++++ fbreader/makefiles/arch/maemo.mk	2009-05-01 00:09:37.787032186 +0300
+@@ -18,8 +18,8 @@
+ 	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic
+ else ifeq "$(UI_TYPE)" "maemo4"
+ 	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -DMAEMO_VERSION=4
+-	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
+-	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic
++	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
++	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0
+ else # ifeq "$(UI_TYPE)" "maemo2/3"
+ 	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -mthumb
+ 	GTKINCLUDE = -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/hildon-widgets -I/usr/include/hildon-lgpl -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/100-fix-centering-with-margins.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/100-fix-centering-with-margins.patch
--- fbreader-0.8.17/debian/patches/100-fix-centering-with-margins.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/100-fix-centering-with-margins.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- fbreader-0.8.17.orig/zlibrary/text/src/view/ZLTextView_paint.cpp
-+++ fbreader-0.8.17/zlibrary/text/src/view/ZLTextView_paint.cpp
-@@ -223,7 +223,7 @@
- 			context().moveX(leftMargin() + viewWidth() - myStyle.textStyle()->rightIndent() - info.Width);
- 			break;
- 		case ALIGN_CENTER:
--			context().moveX(leftMargin() + (viewWidth() - myStyle.textStyle()->rightIndent() - info.Width) / 2);
-+			context().moveX((viewWidth() - myStyle.textStyle()->rightIndent() - info.Width) / 2);
- 			break;
- 		case ALIGN_JUSTIFY:
- 			if (!endOfParagraph && (info.End.element().kind() != ZLTextElement::AFTER_PARAGRAPH_ELEMENT)) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/110-use-sensible-browser.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/110-use-sensible-browser.patch
--- fbreader-0.8.17/debian/patches/110-use-sensible-browser.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/110-use-sensible-browser.patch	2009-05-16 15:24:11.000000000 +0100
@@ -1,3 +1,4 @@
+Use sensible-browser instead of "mozilla".
 --- fbreader-0.8.17.orig/fbreader/data/default/external.desktop.xml
 +++ fbreader-0.8.17/fbreader/data/default/external.desktop.xml
 @@ -3,7 +3,7 @@
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/200-maemo-gtkentryparameter.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/200-maemo-gtkentryparameter.patch
--- fbreader-0.8.17/debian/patches/200-maemo-gtkentryparameter.patch	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/200-maemo-gtkentryparameter.patch	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1,19 @@
+Comment out hildon calls that aren't hacked into Debian GTK+ library.
+Index: fbreader/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp
+===================================================================
+--- fbreader.orig/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp	2009-03-31 18:51:25.970379910 +0300
++++ fbreader/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp	2009-03-31 18:52:25.308828507 +0300
+@@ -73,11 +73,13 @@
+ 	gtk_entry_set_alignment(myEntry, 0.5);
+ 	gtk_entry_set_width_chars(myEntry, item.maxWidth());
+ 	gtk_entry_set_max_length(myEntry, item.maxWidth());
++	/*
+ 	if (item.symbolSet() == ZLToolbar::ParameterItem::SET_DIGITS) {
+ 		hildon_gtk_entry_set_input_mode(myEntry, HILDON_GTK_INPUT_MODE_NUMERIC);
+ 	} else {
+ 		hildon_gtk_entry_set_input_mode(myEntry, HILDON_GTK_INPUT_MODE_FULL);
+ 	}
++	*/
+ 	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "key_press_event", GTK_SIGNAL_FUNC(::onKeyPressed), this);
+ }
+ 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/900-delete-useless-strip-flag.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/900-delete-useless-strip-flag.patch
--- fbreader-0.8.17/debian/patches/900-delete-useless-strip-flag.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/900-delete-useless-strip-flag.patch	2009-05-16 15:24:11.000000000 +0100
@@ -1,3 +1,4 @@
+Don't strip fbreader binary directly after building, dh_strip will do it.
 --- fbreader-0.8.17.orig/makefiles/config.mk
 +++ fbreader-0.8.17/makefiles/config.mk
 @@ -19,7 +19,7 @@
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/910-remove-deprecated-fields-in-desktop-file.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/910-remove-deprecated-fields-in-desktop-file.patch
--- fbreader-0.8.17/debian/patches/910-remove-deprecated-fields-in-desktop-file.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/910-remove-deprecated-fields-in-desktop-file.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
---- fbreader-0.8.17.orig/fbreader/desktop/desktop
-+++ fbreader-0.8.17/fbreader/desktop/desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=E-book reader
- Name[ru]=Чтение электронных книг
- GenericName=E-book reader
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/930-use-shell-make-variable.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/930-use-shell-make-variable.patch
--- fbreader-0.8.17/debian/patches/930-use-shell-make-variable.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/930-use-shell-make-variable.patch	2009-05-16 15:24:11.000000000 +0100
@@ -1,7 +1,8 @@
-Index: fbreader-0.8.17/Makefile
+Use shell MAKE variable to allow parallel builds.
+Index: fbreader/Makefile
 ===================================================================
---- fbreader-0.8.17.orig/Makefile	2008-07-12 20:35:07.446242261 +0300
-+++ fbreader-0.8.17/Makefile	2008-07-12 20:57:43.101198896 +0300
+--- fbreader.orig/Makefile	2009-03-29 18:33:45.941040634 +0300
++++ fbreader/Makefile	2009-03-29 18:34:50.481041319 +0300
 @@ -21,21 +21,21 @@
  do_install:
  	@for dir in $(ZLIBDIRS) $(APPDIRS); do \
@@ -27,10 +28,10 @@
  		fi; \
  	done
  
-Index: fbreader-0.8.17/fbreader/Makefile
+Index: fbreader/fbreader/Makefile
 ===================================================================
---- fbreader-0.8.17.orig/fbreader/Makefile	2008-07-12 20:35:07.474240442 +0300
-+++ fbreader-0.8.17/fbreader/Makefile	2008-07-12 20:57:43.101198896 +0300
+--- fbreader.orig/fbreader/Makefile	2009-03-29 18:33:45.957035125 +0300
++++ fbreader/fbreader/Makefile	2009-03-29 18:34:50.481041319 +0300
 @@ -55,13 +55,13 @@
  	@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
  	@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
@@ -47,11 +48,11 @@
 +		cd $$subdir; $(MAKE) clean; cd ..; \
  	done;
  	@$(RM) $(TARGET) err
-Index: fbreader-0.8.17/zlibrary/core/Makefile
+Index: fbreader/zlibrary/core/Makefile
 ===================================================================
---- fbreader-0.8.17.orig/zlibrary/core/Makefile	2008-07-12 20:58:36.164533413 +0300
-+++ fbreader-0.8.17/zlibrary/core/Makefile	2008-07-12 20:59:05.192170165 +0300
-@@ -32,7 +32,7 @@
+--- fbreader.orig/zlibrary/core/Makefile	2009-03-29 18:33:45.973035972 +0300
++++ fbreader/zlibrary/core/Makefile	2009-03-29 18:34:50.481041319 +0300
+@@ -38,7 +38,7 @@
  endif
  
  .objects:
@@ -60,11 +61,11 @@
  		if [ -d $$subdir ]; then \
  			if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \
  				exit 1; \
-Index: fbreader-0.8.17/zlibrary/text/Makefile
+Index: fbreader/zlibrary/text/Makefile
 ===================================================================
---- fbreader-0.8.17.orig/zlibrary/text/Makefile	2008-07-12 20:58:36.200532262 +0300
-+++ fbreader-0.8.17/zlibrary/text/Makefile	2008-07-12 20:59:15.816037514 +0300
-@@ -16,7 +16,7 @@
+--- fbreader.orig/zlibrary/text/Makefile	2009-03-29 18:33:45.989033397 +0300
++++ fbreader/zlibrary/text/Makefile	2009-03-29 18:34:50.481041319 +0300
+@@ -22,7 +22,7 @@
  SUBDIRS = src/model src/view src/hyphenation
  
  .objects:
@@ -73,11 +74,11 @@
  		if [ -d $$subdir ]; then \
  			if ! $(LIBMAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk; then \
  				exit 1; \
-Index: fbreader-0.8.17/zlibrary/ui/Makefile
+Index: fbreader/zlibrary/ui/Makefile
 ===================================================================
---- fbreader-0.8.17.orig/zlibrary/ui/Makefile	2008-07-12 20:58:36.280532094 +0300
-+++ fbreader-0.8.17/zlibrary/ui/Makefile	2008-07-12 20:59:58.379502075 +0300
-@@ -53,21 +53,21 @@
+--- fbreader.orig/zlibrary/ui/Makefile	2009-03-29 18:33:46.005032289 +0300
++++ fbreader/zlibrary/ui/Makefile	2009-03-29 18:34:50.485038965 +0300
+@@ -66,21 +66,21 @@
  endif
  
  .objects:
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/940-use-debian-compiler-flags.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/940-use-debian-compiler-flags.patch
--- fbreader-0.8.17/debian/patches/940-use-debian-compiler-flags.patch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/940-use-debian-compiler-flags.patch	2009-05-16 15:24:11.000000000 +0100
@@ -1,8 +1,9 @@
-Index: fbreader-0.8.17/makefiles/config.mk
+Use Debian-provided CFLAGS instead of hardcoded ones.
+Index: fbreader/makefiles/config.mk
 ===================================================================
---- fbreader-0.8.17.orig/makefiles/config.mk	2008-07-13 23:00:35.872946352 +0300
-+++ fbreader-0.8.17/makefiles/config.mk	2008-07-13 23:01:18.080416155 +0300
-@@ -27,6 +27,7 @@
+--- fbreader.orig/makefiles/config.mk	2009-05-01 00:02:07.627296330 +0300
++++ fbreader/makefiles/config.mk	2009-05-01 00:02:07.814799901 +0300
+@@ -31,6 +31,7 @@
  ifeq "$(TARGET_STATUS)" "profile"
  	CFLAGS += -O3 -g -pg
  endif
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/patches/series /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/patches/series
--- fbreader-0.8.17/debian/patches/series	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/patches/series	2009-05-16 15:24:11.000000000 +0100
@@ -1,8 +1,7 @@
 005-maemo-makefile.patch
-010-add-missing-headers.patch
-100-fix-centering-with-margins.patch
+020-maemo-disable-libconic.patch
 110-use-sensible-browser.patch
+200-maemo-gtkentryparameter.patch
 900-delete-useless-strip-flag.patch
-910-remove-deprecated-fields-in-desktop-file.patch
 930-use-shell-make-variable.patch
 940-use-debian-compiler-flags.patch
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/README.source /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/README.source
--- fbreader-0.8.17/debian/README.source	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/README.source	2009-05-16 15:24:11.000000000 +0100
@@ -0,0 +1,9 @@
+This Debian package for FBReader does not contain some hyphenation patterns due
+to following license problems:
+
+el.pattern: no license
+fi.pattern: modification is not explicitly allowed
+tr.pattern: no license
+
+These files were removed from zlibrary/text/data/hyphenationPatterns.zip.
+
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/rules /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/rules
--- fbreader-0.8.17/debian/rules	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/rules	2009-05-16 15:24:11.000000000 +0100
@@ -5,11 +5,6 @@
 	AUXMAKEFLAGS += -j$(NUMJOBS)
 endif
 
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 CFLAGS += -D_REENTRANT
 
 %:
@@ -36,9 +31,11 @@
 install: build
 	dh install --before dh_auto_install
 	$(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/tmp do_install
-	cp -r $(DEB_DIR)/tmp/usr/share/zlibrary $(DEB_DIR)/libzlcore-data/usr/share
-	cp -r $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzlcore0.9/usr/
-	$(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext0.9 do_install
+	mv $(DEB_DIR)/tmp/usr/share/zlibrary $(DEB_DIR)/libzlcore-data/usr/share
+	mv $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzlcore0.10/usr/
+	$(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/tmp do_install
+	mv $(DEB_DIR)/tmp/usr/share/zlibrary $(DEB_DIR)/libzltext-data/usr/share
+	mv $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzltext0.10/usr/
 	$(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzlcore-dev do_install_dev
 	$(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext-dev do_install_dev
 	$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk DESTDIR=$(DEB_DIR)/libzlui-gtk do_install
@@ -55,11 +52,10 @@
 binary-indep: binary-arch
 	dh binary-indep
 
-binary-arch: VERSION=$(shell expr "`dpkg-parsechangelog |grep Version:`" : '.*Version: \(.*\)-.*')
 binary-arch: build install
 	dh binary-arch --before dh_makeshlibs
-	dh_makeshlibs -plibzlcore0.9 -V"libzlcore0.9 (>= $(VERSION)), libzlcore0.9 (<< 0.10.0)"
-	dh_makeshlibs -plibzltext0.9 -V"libzltext0.9 (>= $(VERSION)), libzltext0.9 (<< 0.10.0)"
+	dh_makeshlibs -plibzlcore0.10
+	dh_makeshlibs -plibzltext0.10
 	dh binary-arch --after dh_makeshlibs
 
 binary:	binary-indep binary-arch
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/debian/watch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/debian/watch
--- fbreader-0.8.17/debian/watch	2009-05-16 15:24:10.000000000 +0100
+++ fbreader-0.10.7dfsg/debian/watch	2009-05-16 15:24:11.000000000 +0100
@@ -1,2 +1,3 @@
 version=2
-http://www.fbreader.org/downloads.php fbreader-sources-(.*).tgz
+opts=dversionmangle=s/dfsg\d*$// \
+	http://www.fbreader.org/downloads.php fbreader-sources-(.*).tgz
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/desktop/changelog /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/desktop/changelog
--- fbreader-0.8.17/distributions/debian/desktop/changelog	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/desktop/changelog	2009-04-30 22:26:45.000000000 +0100
@@ -1,3 +1,57 @@
+fbreader (0.10.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 30 Mar 2009 13:29:00 +0400
+
+fbreader (0.10.6-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 26 Mar 2009 22:15:00 +0200
+
+fbreader (0.10.5-1) stable; urgency=low
+
+  * new upstream version
+  * conflicts with ubuntu fbreader packages have been resolved
+  * dependencies for libzltext-dev have been fixed
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2009 18:12:00 +0200
+
+fbreader (0.10.4-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Wed, 18 Mar 2009 23:33:00 +0200
+
+fbreader (0.10.3-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 5 Feb 2009 01:11:00 +0200
+
+fbreader (0.10.2-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 17 Jan 2009 23:42:00 +0300
+
+fbreader (0.10.1-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 16 Jan 2009 12:31:00 +0300
+
+fbreader (0.10.0-1) stable; urgency=low
+
+  * new upstream version
+  * add-missing-headers.patch integrated into the upstream
+  * fix-centering-with-margins.patch integrated into the upstream
+  * use-sensible-browser.patch added to the upstream debian fileset
+  * remove-deprecated-fields-in-desktop-file.patch intgerated into the upstream
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 3 Aug 2008 19:01:00 +0400
+
 fbreader (0.8.17-1) stable; urgency=low
 
   * new upstream version
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/desktop/control /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/desktop/control
--- fbreader-0.8.17/distributions/debian/desktop/control	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/desktop/control	2009-04-30 22:26:45.000000000 +0100
@@ -1,9 +1,9 @@
 Source: fbreader
 Section: text
 Priority: optional
-Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.22), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev, liblinebreak-dev
+Maintainer: Nikolay Pultsin <geometer@fbreader.org>
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), libgtk2.0-dev, libqt3-mt-dev, libqt4-dev, libexpat1-dev, libbz2-dev, libz-dev, liblinebreak-dev (>= 1.0-1), libjpeg-dev, libfribidi-dev, libcurl3-dev, quilt (>= 0.40)
 
 Package: fbreader
 Priority: optional
@@ -25,6 +25,7 @@
   * keeps the last open book and the last read positions for all open books
     between runs
   * automatic hyphenation (patterns for several languages are included)
+  * search and download books from network libraries
  .
   Homepage: http://www.fbreader.org/
 
@@ -33,59 +34,82 @@
 Priority: optional
 Architecture: any
 Conflicts: fbreader-gtk, fbreader-qt, fbreader-qt4
+Replaces: libzlcore-data
 Depends: ${shlibs:Depends}
-Description: zlibrary core
- This is the core of zlibrary, the library that the fbreader e-book reader
+Description: ZLibrary core
+ This is the core of ZLibrary, the library that the fbreader e-book reader
  is based on.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzltext
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore (= ${Source-Version})
-Description: zlibrary text model/viewer
- This package provides text model/viewer part of zlibrary.
+Replaces: libzltext-data
+Depends: ${shlibs:Depends}, libzlcore (= ${binary:Version})
+Description: ZLibrary text model/viewer
+ This package provides text model/viewer part of ZLibrary.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzlui-gtk
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore (= ${Source-Version})
+Depends: ${shlibs:Depends}, libzlcore (= ${binary:Version})
 Provides: libzlui
-Description: Gtk interface module for zlibrary
- This package provides a gtk+-based UI for zlibrary.
+Description: GTK+ interface module for ZLibrary
+ This package provides a GTK+-based UI for ZLibrary.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzlui-qt
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore (= ${Source-Version})
+Depends: ${shlibs:Depends}, libzlcore (= ${binary:Version})
 Provides: libzlui
-Description: Qt3 interface module for zlibrary
- This package provides a qt3-based UI for zlibrary.
+Description: Qt3 interface module for ZLibrary
+ This package provides a Qt3-based UI for ZLibrary.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzlui-qt4
 Section: libs
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, libzlcore (= ${Source-Version})
+Depends: ${shlibs:Depends}
 Provides: libzlui
-Description: Qt4 interface module for zlibrary
- This package provides a qt4-based UI for zlibrary.
+Description: Qt4 interface module for ZLibrary
+ This package provides a Qt4-based UI for ZLibrary.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzlcore-dev
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: libzlcore (= ${Source-Version})
-Description: zlibrary core - development files
- This is the core of zlibrary, the library that the fbreader e-book reader
- is based on.
+Depends: libzlcore, ${shlibs:Depends}, libzlcore (= ${binary:Version})
+Description: ZLibrary core - development files
+ This package contains development files for the ZLibrary core.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
 
 Package: libzltext-dev
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: libzltext (= ${Source-Version})
-Description: zlibrary text model/viewer -development files
- This package provides text model/viewer part of zlibrary.
+Depends: libzltext, ${shlibs:Depends}, libzltext (= ${binary:Version})
+Description: ZLibrary text model/viewer - development files
+ This package contains development files for the ZLibrary text model/viewer
+ library.
+ .
+ ZLibrary is a cross-platform library to build applications running on desktop
+ Linux, Windows, different Linux-based PDAs using this library.
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/desktop/patches/110-use-sensible-browser.patch /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/desktop/patches/110-use-sensible-browser.patch
--- fbreader-0.8.17/distributions/debian/desktop/patches/110-use-sensible-browser.patch	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/desktop/patches/110-use-sensible-browser.patch	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,11 @@
+--- fbreader-0.10.0.orig/fbreader/data/default/external.desktop.xml
++++ fbreader-0.10.0/fbreader/data/default/external.desktop.xml
+@@ -3,7 +3,7 @@
+ 	<section name="Web Browser">
+ 		<program name="%browser" protocol="execute">
+ 			<action name="openLink" command="%command"/>
+-			<option name="command" defaultValue="mozilla %1 &amp;"/>
++			<option name="command" defaultValue="sensible-browser %1 &amp;"/>
+ 		</program>
+ 	</section>
+ </ExternalPrograms>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/desktop/patches/series /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/desktop/patches/series
--- fbreader-0.8.17/distributions/debian/desktop/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/desktop/patches/series	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+110-use-sensible-browser.patch
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/desktop/rules /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/desktop/rules
--- fbreader-0.8.17/distributions/debian/desktop/rules	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/desktop/rules	2009-04-30 22:26:45.000000000 +0100
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
-clean:
+clean: unpatch
 		dh_testdir
 		dh_testroot
 		[ ! -f Makefile ] || $(MAKE) distclean
 		dh_clean build-stamp install-stamp
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 		dh_testdir
 		$(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy
@@ -17,9 +17,8 @@
 		$(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy
 		touch build-stamp 
 
-install: install-stamp
-install-stamp: DEB_DIR = $(CURDIR)/debian
-install-stamp: build
+install: DEB_DIR = $(CURDIR)/debian
+install: build
 		dh_testdir
 		dh_testroot
 		dh_clean -k
@@ -46,16 +45,14 @@
 		dh_strip
 		dh_compress
 		dh_fixperms
-		dh_makeshlibs -plibzlcore -V"libzlcore (>= $(VERSION)),libzlcore(<< 0.10.0)"
-		dh_makeshlibs -plibzltext -V"libzltext (>= $(VERSION)),libzltext(<< 0.10.0)"
+		dh_makeshlibs -plibzlcore -V"libzlcore (>= $(VERSION)),libzlcore(<< 0.11.0)"
+		dh_makeshlibs -plibzltext -V"libzltext (>= $(VERSION)),libzltext(<< 0.11.0)"
 		dh_installdeb
 		dh_shlibdeps -l debian/libzlcore/usr/lib:debian/libzltext/usr/lib
 		dh_gencontrol
 		dh_md5sums
 		dh_builddeb
 
-binary-indep:
+binary:	binary-arch
 
-binary:	binary-indep binary-arch
-
-.PHONY: clean build install binary-indep binary-arch binary
+include /usr/share/quilt/quilt.make
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/changelog /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/changelog
--- fbreader-0.8.17/distributions/debian/maemo2/changelog	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/changelog	2009-04-30 22:26:45.000000000 +0100
@@ -1,3 +1,46 @@
+fbreader (0.10.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 30 Mar 2009 13:29:00 +0400
+
+fbreader (0.10.6-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 26 Mar 2009 22:15:00 +0200
+
+fbreader (0.10.5-3) stable; urgency=low
+
+  * versions for maemo2 and maemo3 were separated: maemo2 doesn't contain
+    conic library
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 22 Mar 2009 17:37:00 +0200
+
+fbreader (0.10.5-2) stable; urgency=low
+
+  * version with more debug information
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 22 Mar 2009 11:42:00 +0200
+
+fbreader (0.10.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2009 18:12:00 +0200
+
+fbreader (0.10.4-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 8 Feb 2009 03:24:00 +0300
+
+fbreader (0.10.0-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 3 Aug 2008 19:01:00 +0400
+
 fbreader (0.8.17-1) stable; urgency=low
 
   * new upstream version
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/control /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/control
--- fbreader-0.8.17/distributions/debian/maemo2/control	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/control	2009-04-30 22:26:45.000000000 +0100
@@ -2,14 +2,15 @@
 Priority: optional
 Maintainer: Nikolay Pultsin <geometer@fbreader.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper, libexpat1-dev, libbz2-dev, libz-dev, hildon-libs-dev, libosso-dev, liblinebreak-dev
+Build-Depends: debhelper, libexpat1-dev, libbz2-dev, libz-dev, hildon-libs-dev, libosso-dev, liblinebreak-dev, libfribidi-dev, libcurl3-dev
 
-Package: libzlibrary-maemo2
+Package: libzlibrary-maemo2-noconic
 Section: user/libs
 Priority: optional
 Architecture: armel
+Replaces: libzlibrary-maemo2
 Conflicts: fbreader-maemo2 (<< 0.8.0)
-Depends: hildon-libs0, libatk1.0-0 (>= 1.9.0), libbz2-1.0, libc6 (>= 2.3.5-1), libexpat1 (>= 1.95.8), libgcc1 (>= 1:3.4.4), libglib2.0-0 (>= 2.8.6-1osso1), libgtk2.0-0 (>= 2:2.6.10-1.osso8), libosso1, libpango1.0-0 (>= 1.8.1), libstdc++6 (>= 3.4.4), zlib1g (>= 1:1.2.1)
+Depends: hildon-libs0, libatk1.0-0 (>= 1.9.0), libbz2-1.0, libc6 (>= 2.3.5-1), libexpat1 (>= 1.95.8), libgcc1 (>= 1:3.4.4), libglib2.0-0 (>= 2.8.6-1osso1), libgtk2.0-0 (>= 2:2.6.10-1.osso8), libosso1, libpango1.0-0 (>= 1.8.1), libstdc++6 (>= 3.4.4), zlib1g (>= 1:1.2.1), libfribidi0, libcurl3, liblinebreak-maemo2
 Description: Platform-dependent part of fbreader
  Home page: http://www.fbreader.org/
 
@@ -18,7 +19,7 @@
 Priority: optional
 Architecture: armel
 Replaces: libzlibrary-dev
-Depends: libzlibrary-maemo2 (= ${Source-Version})
+Depends: libzlibrary-maemo2 (= ${Source-Version}) | libzlibrary-maemo2-noconic (= ${Source-Version})
 Description: zlibrary - development files
  Home page: http://www.fbreader.org/
 
@@ -46,29 +47,35 @@
  Home page: http://www.fbreader.org/
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABmJLR0QA/wD/
- AP+gvaeTAAAACXBIWXMAAAFDAAABQwEfSBMjAAAAB3RJTUUH1wcdFhwBWmdn
- bAAABCRJREFUSMe9lNtPXFUUxr99bnNjGJj7jQEKUyKUQSNpa2tRY2JsgqL/
- Rl8aNfHRJ+MbJpJQo03FVNoHQ0ysWkyatKkJ5da0CJWb0mFmYOjAXJj79Zzt
- A8w4IQNDx+iXnGSflW+vX/Zaa2/gCBlcAyqDa6C/QvzlA/9yg+vdKxV8g8U1
- dwRELmML163q7OmWc+f9sw8mHrl6T6szMsd4rkB2doD3932CwBRGmhrzfa2v
- XriTyWTHAaizitZbnMpg3JnHR4eC9jd/e6qJ6zXptPZ4InlP/05/IJBWWK0n
- XqN+9+LIvo/jGfFql509azForZls7mYylQ4FUkpdvf2sFA0GFoo5mQoQjmfE
- a1129oxJV+8AAHWdqj6FBqeq6RWShqaukM9qDa4BhmfEK51Wct5i0LQAgFwm
- yOOSxia3n0GG1SvL8zIHIAzPiF91Wsi54mYA8IUkUENPLsXqlaG1CahpsJsj
- 4lCHmb5uMzW0FX3eMAXV9+TTrEF+8ABcGYRwRBzuMKPPZm44UYxvhEWIuh4x
- yZiFqHsKrepd7MaZbqcp73RYdIqibzMigep6pBRr5iu1owTiiPj5SRN902HR
- thdj/ogIUXsKCdbKRtdn0KwMIpkWUcfnSTlka1eEpHUhwVqZw4aLAQBzT/9g
- m5FebLFpnSVIOI9CQycSnANRz0PY5NtIZkQwUgYOS2Mpwfp2FnlNF2Ks/aib
- sgdqbe94T6mqa/+nDBRhSYe40IKobw5mfgstBgFgZYC6GaF4AfkChSfCI04b
- QdXNIqqIA4C33r4YJBD1iwuP1IRTEGOzHeSZN+fxzAt6eNFmkgEA5EoFLl3+
- AD/f/hWhcBgmhxPplbksCJsDRHVVEECp6wWnuqHRCG8gBm8gitBOcLdR9BhP
- 2mQlsyRRyAUeF/regDcQhTcQQwGypyCsGRBxDBBACCl+lBACtVJWT/I8JAow
- BNjcpchKAsr8lBACMEwWx9ChT1BH90sJu6ZX/tv9e6AgUDnawOaSoKCoRYeC
- GJYr9L7YBYPFUSpTcsuHWsU8l5vw/xPoX+g/BUlinq0JRCsuK4vPB5diIf/X
- NYEEnolRir2xPsonhpc2lmeHfVM3r9ZWOklcrQaRSdHljaWZa76pG8M19YgQ
- Qiml+aM8csRXNpambngnRwdrHAZCqzVGwaRWfYuT33sefPdprVNHy6pFK58k
- HfY+mfjRM3H9k+d+GQghmT1IWU+oRKQDqFw6KV+aufOLZ3L046r36M81dySa
- ym2X6BzjfzQ9sfp4dXM8W6BhAGBZ1u13L68PfTlyP5LIhCSQRGh746fglue2
- Z3L0crWysADwLMaMub1+o8QKJBKNb63Mz3zzcOyzSwtrweRfT91ZygqR3yfv
- jv0xPvRhEpq7s9PTheUn84tri3O3Ao9/+OI4Xf4bjmS8Dw4gGSwAAAAASUVO
- RK5CYII=
+ AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QEKFjEFBaQC
+ bAAABStJREFUSMftlsmPXFcVh79zhzfX0Gm3y+20GwcnDomMEJEVAXIk2CAG
+ YaYVEUhs2WWTRRbsQCzZgGADKyT2RkLKAgkiYaJsIkAx3R7iEbvT6a4eqrte
+ Vb07ZFHV7W6TPwAkrnSk867OO997v3N07oX/r//2JQfOlT+9ZT+xdLqXhiBl
+ WTYhENc2Hsn2j9/49MI4LKjLX7u9cPmr7zz9yRf90QTr+7uiXaoGdS1b21uy
+ v9VnY+1RlNCEb3732+E/QN//2a9/+qVLn3/9QmLlxFNt70PD8MN1Vl/7UbJ0
+ 77Ysd8rQPPvstb9++RtXRifPP1VuPlgmNr25qlVOTp1Ni7LU7XbLdMqCTqvw
+ mzvbk9/+4c+j8eLp3/zyB1//uTkAPZr4Z665wr75q5+wt71pyiKn1+pQzs1z
+ dXWV17ulym/fupC9+ccL409tcHH0kPTUaf6tc/bEkmlDqhRaKZI0ocpzbHTs
+ mnwJ4BA09JFoDSsr17hz8zpoQYBQO85OFN/r72CMYrhyHbf4PH2nKUc5e16z
+ s7FJkIi1lixJIQoQiTEiRADUASjPC3yIKGUQLWgRtGhERVCRXQn4xjHyEU9k
+ f+xogiIqM9U/ggiIHKYkxgjyBKjKMyYxYo3BKIM1ljzLKfOCEzi8g2Hj6HuH
+ pMn0a5VCRRCtpr5SKA1KTUtflOUB57F0mTWMG48gJDYlzTKyrCBVwvm9XULj
+ 2PeeD7SmlVXEuEkwBiOC0hpRgiCIKESmvjEJ+CdAIpHBYAgiZFlBVbVotzpk
+ ecqp+zfZH48JUdhpzSPtDlEZnPMYQBmDPG5gEEFESIxlEvxx6SyKwf4eRZ5T
+ lS263S7tToeyrKiMxUdQEhh3u4Q0Q0JAxTBNavSs+LNiAdpoqqrE+SdqZIKj
+ HjWkSUpRlFRVSVHk5EWBa1WUEqmAKNM+SgUSPFpAqWmaOIMIoJWmVRSznSPS
+ RTyT8Zhet8u4HpHlOXmeYWzCZl7RU5okETKtic2YNDqsimA1WmsAQpy2dIwR
+ rYQ0fSzpIagZjXEywugEY+ysIQqKvGA9BpL5ORYTz9lmj2TjIa1OSt7O+SAx
+ s+JD8B7nAsEHtNbkWQZhcFy6wdbONEAprDUYM21xrYXGGv5y5jnM/AlefWaR
+ xa0HlN0MFye4rJjKpYQQPK6Z4BqHKEWZ58gMcfhHdV1Dy9GZn6PfXwcUzjtC
+ tGSfe4V3rr7FP3pPUyc9Xj73AlY79PwSae8EfjxNbLQBEaJERCBJ7KxBjoC0
+ NnSU49IXXqH32UvUJmVdlfTrPfxwh/iZL1KlmnqiWY2OUW+R83MZ81UbY0aI
+ gLEWmySIKEKIpEaBhOOgIkvwSuGLioEkDCYNy8rR155+XlDfvcmWUYgWfFIx
+ HA3pDyFpJqjop1NBCTFmTLwD0YhAnB0UhzVSCKUEnBh6MmK5GdAUBec6GUux
+ Yb9oMxlssPfuVXqjXc5XCWfaOd1OSVEUlGWJtVOpvPf4EDBaMxrVT4ygxPhW
+ YlGDD+kkHVwzonP3PaIQ9drDcXbtn2s3Htx59+b1f71968bKuYsvXXzphedf
+ XDpzZrnd6XSTVquljDGilCARYgj+/dWVv6/+/hdXjh58cvnVH37n5a9863f1
+ yoqcXJjfvv/w3q17d99/e2Xlvb/dv3/vxs7Odj+E4GfvqJnpJEkypXSxsHCy
+ yLM8ESXWWuvrerh2587tW977GggHICUiutXunLLG6MFgUDfNpIkxTgDHdDSG
+ j7kCyMfsxVlsPGLHAg+eD+xY4P/M+ght8RxOZDxGnAAAAABJRU5ErkJggg==
+ ====
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postinst /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postinst
--- fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postinst	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postinst	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postrm /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postrm
--- fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postrm	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2-noconic.postrm	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2-noconic.shlibs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2-noconic.shlibs
--- fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2-noconic.shlibs	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2-noconic.shlibs	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,2 @@
+libzlcore @SOVERSIONCORE@ libzlibrary-maemo2 (>= @VERSION@-1) | libzlibrary-maemo2-noconic (>= @VERSION@-1), libzlibrary-maemo2 (<< 0.11.0) | libzlibrary-maemo2-noconic (<< 0.11.0)
+libzltext @SOVERSIONCORE@ libzlibrary-maemo2 (>= @VERSION@-1) | libzlibrary-maemo2-noconic (>= @VERSION@-1), libzlibrary-maemo2 (<< 0.11.0) | libzlibrary-maemo2-noconic (<< 0.11.0)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2.postinst /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2.postinst
--- fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2.postinst	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2.postrm /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2.postrm
--- fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2.postrm	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2.postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2.shlibs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2.shlibs
--- fbreader-0.8.17/distributions/debian/maemo2/libzlibrary-maemo2.shlibs	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/libzlibrary-maemo2.shlibs	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-libzlcore @SOVERSION@ libzlibrary-maemo2 (>= @VERSION@-1), libzlibrary-maemo2 (<< 0.10.0-1)
-libzltext @SOVERSION@ libzlibrary-maemo2 (>= @VERSION@-1), libzlibrary-maemo2 (<< 0.10.0-1)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo2/rules /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo2/rules
--- fbreader-0.8.17/distributions/debian/maemo2/rules	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo2/rules	2009-04-30 22:26:45.000000000 +0100
@@ -38,9 +38,9 @@
 		dh_testroot
 		dh_clean -k
 		dh_installdirs
-		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2 do_install
-		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2 do_install
-		$(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2 do_install
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-noconic do_install
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-noconic do_install
+		$(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-noconic do_install
 		$(MAKE) -C fbreader TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/fbreader-maemo2 do_install
 		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-dev do_install_dev
 		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo2 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-dev do_install_dev
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/changelog /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/changelog
--- fbreader-0.8.17/distributions/debian/maemo3/changelog	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/changelog	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,225 @@
+fbreader (0.10.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 30 Mar 2009 13:29:00 +0400
+
+fbreader (0.10.6-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 26 Mar 2009 22:15:00 +0200
+
+fbreader (0.10.5-3) stable; urgency=low
+
+  * versions for maemo2 and maemo3 were separated: maemo2 doesn't contain
+    conic library
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 22 Mar 2009 17:37:00 +0200
+
+fbreader (0.10.5-2) stable; urgency=low
+
+  * version with more debug information
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 22 Mar 2009 11:42:00 +0200
+
+fbreader (0.10.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2009 18:12:00 +0200
+
+fbreader (0.10.4-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 8 Feb 2009 03:24:00 +0300
+
+fbreader (0.10.0-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 3 Aug 2008 19:01:00 +0400
+
+fbreader (0.8.17-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 23 Mar 2008 03:30:00 +0300
+
+fbreader (0.8.16-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2008 03:10:00 +0300
+
+fbreader (0.8.15-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Tue, 26 Feb 2008 02:41:00 +0300
+
+fbreader (0.8.14-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 9 Feb 2008 22:48:00 +0300
+
+fbreader (0.8.13-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 24 Jan 2008 15:24:00 +0300
+
+fbreader (0.8.12-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 19 Jan 2008 03:47:00 +0300
+
+fbreader (0.8.11-1) stable; urgency=low
+
+  * new upstream version
+  * dependency rules have been changed
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 12 Jan 2008 22:27:00 +0300
+
+fbreader (0.8.10-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 4 Jan 2008 20:53:00 +0300
+
+fbreader (0.8.9-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 27 Dec 2007 07:13:00 +0300
+
+fbreader (0.8.8d-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 24 Dec 2007 10:27:00 +0300
+
+fbreader (0.8.8c-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 23 Dec 2007 08:14:00 +0300
+
+fbreader (0.8.8b-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 20 Dec 2007 22:30:00 +0300
+
+fbreader (0.8.8a-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 17 Dec 2007 03:03:00 +0300
+
+fbreader (0.8.8-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 23 Nov 2007 22:55:00 +0300
+
+fbreader (0.8.7b-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Tue, 6 Nov 2007 22:55:00 +0300
+
+fbreader (0.8.7a-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 3 Nov 2007 00:00:00 +0400
+
+fbreader (0.8.7-3) stable; urgency=low
+
+  * dependencies list has been fixed
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 20 Oct 2007 00:00:00 +0400
+
+fbreader (0.8.7-2) stable; urgency=low
+
+  * dependencies list has been fixed
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 19 Oct 2007 00:00:00 +0400
+
+fbreader (0.8.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 5 Sep 2007 00:00:00 +0400
+
+fbreader (0.8.6d-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 7 Sep 2007 12:00:00 +0400
+
+fbreader (0.8.6c-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 30 Aug 2007 02:30:00 +0400
+
+fbreader (0.8.6a-1) stable; urgency=low
+
+  * fixed stylus/finger pressing detection problem on Nokia 770 device
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 8 Aug 2007 18:47:00 +0400
+
+fbreader (0.8.6-3) stable; urgency=low
+
+  * fixed fbreader-maemo2 package icon
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 8 Aug 2007 01:55:00 +0400
+
+fbreader (0.8.6-2) stable; urgency=low
+
+  * fixed fbreader-maemo2 package icon
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 8 Aug 2007 01:09:00 +0400
+
+fbreader (0.8.6-1) stable; urgency=low
+
+  * new upstream version
+  * added libzlibrary-dev package
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 5 Aug 2007 23:49:00 +0400
+
+fbreader (0.8.5c-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 19 Jul 2007 15:20:00 +0400
+
+fbreader (0.8.5a-1) stable; urgency=low
+
+  * new upstream version
+  * maemo package icon has been restored
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 7 Jul 2007 02:12:00 +0400
+
+fbreader (0.8.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 7 Jul 2007 02:12:00 +0400
+
+fbreader (0.8.4zz-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 5 Jul 2007 03:17:00 +0400
+
+fbreader (0.8.4z-1) stable; urgency=low
+
+  * Initial release.
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 30 Jun 2007 01:48:00 +0400
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/compat /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/compat
--- fbreader-0.8.17/distributions/debian/maemo3/compat	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/compat	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+4
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/control /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/control
--- fbreader-0.8.17/distributions/debian/maemo3/control	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/control	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,81 @@
+Source: fbreader
+Priority: optional
+Maintainer: Nikolay Pultsin <geometer@fbreader.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper, libexpat1-dev, libbz2-dev, libz-dev, hildon-libs-dev, libosso-dev, liblinebreak-dev, libfribidi-dev, libcurl3-dev, libconic0-dev
+
+Package: libzlibrary-maemo2
+Section: user/libs
+Priority: optional
+Architecture: armel
+Replaces: libzlibrary-maemo2-noconic
+Conflicts: fbreader-maemo2 (<< 0.8.0)
+Depends: hildon-libs0, libatk1.0-0 (>= 1.9.0), libbz2-1.0, libc6 (>= 2.3.5-1), libexpat1 (>= 1.95.8), libgcc1 (>= 1:3.4.4), libglib2.0-0 (>= 2.8.6-1osso1), libgtk2.0-0 (>= 2:2.6.10-1.osso8), libosso1, libpango1.0-0 (>= 1.8.1), libstdc++6 (>= 3.4.4), zlib1g (>= 1:1.2.1), libfribidi0, libcurl3, libconic0, liblinebreak-maemo2
+Description: Platform-dependent part of fbreader
+ Home page: http://www.fbreader.org/
+
+Package: libzlibrary-maemo2-dev
+Section: libdevel
+Priority: optional
+Architecture: armel
+Replaces: libzlibrary-dev
+Depends: libzlibrary-maemo2 (= ${Source-Version}) | libzlibrary-maemo2-noconic (= ${Source-Version})
+Description: zlibrary - development files
+ Home page: http://www.fbreader.org/
+
+Package: fbreader-maemo2
+Section: user/tools
+Priority: optional
+Architecture: armel
+Depends: ${shlibs:Depends}
+Description: e-book reader
+ FBReader is an e-book reader for UNIX/Windows computers.
+ .
+ Main features:
+  * supports several open e-book formats: fb2, html, chm, plucker,
+    palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed
+    mobipocket, plain text
+  * reads directly from tar, zip, gzip, bzip2 archives (you can have
+    several books in one archive)
+  * supports structured view for your e-book collection
+  * automatically determines encoding
+  * automatically generates table of contents
+  * keeps the last open book and the last read positions for all open books
+    between runs
+  * automatic hyphenation (patterns for several languages are included)
+ .
+ Home page: http://www.fbreader.org/
+XB-Maemo-Icon-26:
+ iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABmJLR0QA/wD/
+ AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QEKFjEFBaQC
+ bAAABStJREFUSMftlsmPXFcVh79zhzfX0Gm3y+20GwcnDomMEJEVAXIk2CAG
+ YaYVEUhs2WWTRRbsQCzZgGADKyT2RkLKAgkiYaJsIkAx3R7iEbvT6a4eqrte
+ Vb07ZFHV7W6TPwAkrnSk867OO997v3N07oX/r//2JQfOlT+9ZT+xdLqXhiBl
+ WTYhENc2Hsn2j9/49MI4LKjLX7u9cPmr7zz9yRf90QTr+7uiXaoGdS1b21uy
+ v9VnY+1RlNCEb3732+E/QN//2a9/+qVLn3/9QmLlxFNt70PD8MN1Vl/7UbJ0
+ 77Ysd8rQPPvstb9++RtXRifPP1VuPlgmNr25qlVOTp1Ni7LU7XbLdMqCTqvw
+ mzvbk9/+4c+j8eLp3/zyB1//uTkAPZr4Z665wr75q5+wt71pyiKn1+pQzs1z
+ dXWV17ulym/fupC9+ccL409tcHH0kPTUaf6tc/bEkmlDqhRaKZI0ocpzbHTs
+ mnwJ4BA09JFoDSsr17hz8zpoQYBQO85OFN/r72CMYrhyHbf4PH2nKUc5e16z
+ s7FJkIi1lixJIQoQiTEiRADUASjPC3yIKGUQLWgRtGhERVCRXQn4xjHyEU9k
+ f+xogiIqM9U/ggiIHKYkxgjyBKjKMyYxYo3BKIM1ljzLKfOCEzi8g2Hj6HuH
+ pMn0a5VCRRCtpr5SKA1KTUtflOUB57F0mTWMG48gJDYlzTKyrCBVwvm9XULj
+ 2PeeD7SmlVXEuEkwBiOC0hpRgiCIKESmvjEJ+CdAIpHBYAgiZFlBVbVotzpk
+ ecqp+zfZH48JUdhpzSPtDlEZnPMYQBmDPG5gEEFESIxlEvxx6SyKwf4eRZ5T
+ lS263S7tToeyrKiMxUdQEhh3u4Q0Q0JAxTBNavSs+LNiAdpoqqrE+SdqZIKj
+ HjWkSUpRlFRVSVHk5EWBa1WUEqmAKNM+SgUSPFpAqWmaOIMIoJWmVRSznSPS
+ RTyT8Zhet8u4HpHlOXmeYWzCZl7RU5okETKtic2YNDqsimA1WmsAQpy2dIwR
+ rYQ0fSzpIagZjXEywugEY+ysIQqKvGA9BpL5ORYTz9lmj2TjIa1OSt7O+SAx
+ s+JD8B7nAsEHtNbkWQZhcFy6wdbONEAprDUYM21xrYXGGv5y5jnM/AlefWaR
+ xa0HlN0MFye4rJjKpYQQPK6Z4BqHKEWZ58gMcfhHdV1Dy9GZn6PfXwcUzjtC
+ tGSfe4V3rr7FP3pPUyc9Xj73AlY79PwSae8EfjxNbLQBEaJERCBJ7KxBjoC0
+ NnSU49IXXqH32UvUJmVdlfTrPfxwh/iZL1KlmnqiWY2OUW+R83MZ81UbY0aI
+ gLEWmySIKEKIpEaBhOOgIkvwSuGLioEkDCYNy8rR155+XlDfvcmWUYgWfFIx
+ HA3pDyFpJqjop1NBCTFmTLwD0YhAnB0UhzVSCKUEnBh6MmK5GdAUBec6GUux
+ Yb9oMxlssPfuVXqjXc5XCWfaOd1OSVEUlGWJtVOpvPf4EDBaMxrVT4ygxPhW
+ YlGDD+kkHVwzonP3PaIQ9drDcXbtn2s3Htx59+b1f71968bKuYsvXXzphedf
+ XDpzZrnd6XSTVquljDGilCARYgj+/dWVv6/+/hdXjh58cvnVH37n5a9863f1
+ yoqcXJjfvv/w3q17d99/e2Xlvb/dv3/vxs7Odj+E4GfvqJnpJEkypXSxsHCy
+ yLM8ESXWWuvrerh2587tW977GggHICUiutXunLLG6MFgUDfNpIkxTgDHdDSG
+ j7kCyMfsxVlsPGLHAg+eD+xY4P/M+ght8RxOZDxGnAAAAABJRU5ErkJggg==
+ ====
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/fbreader-maemo2.postinst /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/fbreader-maemo2.postinst
--- fbreader-0.8.17/distributions/debian/maemo3/fbreader-maemo2.postinst	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/fbreader-maemo2.postinst	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+if [ -x /usr/bin/gtk-update-icon-cache ]
+then
+  /usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor
+fi
+
+if [ -x /usr/bin/update-desktop-database ]
+then
+  /usr/bin/update-desktop-database
+fi
+
+if [ -x /usr/bin/update-mime-database ]
+then
+  /usr/bin/update-mime-database /usr/share/mime
+fi
+
+if [ "$1" = "configure" -a -z "$2" -a -x /usr/bin/maemo-select-menu-location ]
+then
+	/usr/bin/maemo-select-menu-location FBReader.desktop
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/fbreader-maemo2.postrm /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/fbreader-maemo2.postrm
--- fbreader-0.8.17/distributions/debian/maemo3/fbreader-maemo2.postrm	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/fbreader-maemo2.postrm	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+if [ -x /usr/bin/gtk-update-icon-cache ]
+then
+  /usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor
+fi
+
+if [ -x /usr/bin/update-desktop-database ]
+then
+  /usr/bin/update-desktop-database
+fi
+
+if [ -x /usr/bin/update-mime-database ]
+then
+  /usr/bin/update-mime-database /usr/share/mime
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/libzlibrary-maemo2.postinst /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/libzlibrary-maemo2.postinst
--- fbreader-0.8.17/distributions/debian/maemo3/libzlibrary-maemo2.postinst	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/libzlibrary-maemo2.postinst	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/libzlibrary-maemo2.postrm /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/libzlibrary-maemo2.postrm
--- fbreader-0.8.17/distributions/debian/maemo3/libzlibrary-maemo2.postrm	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/libzlibrary-maemo2.postrm	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/libzlibrary-maemo2.shlibs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/libzlibrary-maemo2.shlibs
--- fbreader-0.8.17/distributions/debian/maemo3/libzlibrary-maemo2.shlibs	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/libzlibrary-maemo2.shlibs	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,2 @@
+libzlcore @SOVERSIONCORE@ libzlibrary-maemo2 (>= @VERSION@-1) | libzlibrary-maemo2-noconic (>= @VERSION@-1), libzlibrary-maemo2 (<< 0.11.0) | libzlibrary-maemo2-noconic (<< 0.11.0)
+libzltext @SOVERSIONCORE@ libzlibrary-maemo2 (>= @VERSION@-1) | libzlibrary-maemo2-noconic (>= @VERSION@-1), libzlibrary-maemo2 (<< 0.11.0) | libzlibrary-maemo2-noconic (<< 0.11.0)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo3/rules /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo3/rules
--- fbreader-0.8.17/distributions/debian/maemo3/rules	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo3/rules	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,66 @@
+#!/usr/bin/make -f
+## ----------------------------------------------------------------------
+## debian/rules : package script for fbreader
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+## uncomment this to turn on verbose mode
+#export DH_VERBOSE=1
+
+## ----------------------------------------------------------------------
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+## ----------------------------------------------------------------------
+DEB_DIR		= $(CURDIR)/debian
+
+## ----------------------------------------------------------------------
+## targets
+
+clean:
+		dh_testdir
+		dh_testroot
+		[ ! -f Makefile ] || $(MAKE) distclean
+		dh_clean build-stamp install-stamp
+
+build:		build-stamp
+build-stamp:
+		dh_testdir
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo3
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo3
+		$(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo3
+		$(MAKE) -C fbreader TARGET_ARCH=maemo UI_TYPE=maemo3
+		touch build-stamp 
+
+install:	install-stamp
+install-stamp:	build
+		dh_testdir
+		dh_testroot
+		dh_clean -k
+		dh_installdirs
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo3 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2 do_install
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo3 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2 do_install
+		$(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo3 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2 do_install
+		$(MAKE) -C fbreader TARGET_ARCH=maemo UI_TYPE=maemo3 DESTDIR=$(DEB_DIR)/fbreader-maemo2 do_install
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo3 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-dev do_install_dev
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo3 DESTDIR=$(DEB_DIR)/libzlibrary-maemo2-dev do_install_dev
+		touch install-stamp
+
+binary-indep:
+
+binary-arch:	build install
+		dh_testdir
+		dh_testroot
+		dh_compress -a
+		dh_fixperms -a
+		dh_installdeb -a
+		dh_shlibdeps -a -l $(PWD)/debian/libzlibrary-maemo2/usr/lib
+		dh_gencontrol -a
+		dh_md5sums -a
+		dh_builddeb -a
+
+binary:		binary-indep binary-arch
+
+.PHONY:		clean build install binary-indep binary-arch binary
+
+## ----------------------------------------------------------------------
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo4/changelog /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo4/changelog
--- fbreader-0.8.17/distributions/debian/maemo4/changelog	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo4/changelog	2009-04-30 22:26:45.000000000 +0100
@@ -1,3 +1,33 @@
+fbreader (0.10.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 30 Mar 2009 13:29:00 +0400
+
+fbreader (0.10.6-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 26 Mar 2009 22:15:00 +0200
+
+fbreader (0.10.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2009 18:12:00 +0200
+
+fbreader (0.10.4-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 8 Feb 2009 03:24:00 +0300
+
+fbreader (0.10.0-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 3 Aug 2008 19:01:00 +0400
+
 fbreader (0.8.17-1) stable; urgency=low
 
   * new upstream version
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo4/control /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo4/control
--- fbreader-0.8.17/distributions/debian/maemo4/control	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo4/control	2009-04-30 22:26:45.000000000 +0100
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Nikolay Pultsin <geometer@fbreader.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper, libexpat1-dev, libbz2-dev, libz-dev, libhildon1-dev, libosso-dev, liblinebreak-dev
+Build-Depends: debhelper, libexpat1-dev, libbz2-dev, libz-dev, libhildon1-dev, libosso-dev, liblinebreak-dev, libfribidi-dev, libcurl3-dev
 
 Package: libzlibrary
 Section: user/libs
@@ -45,29 +45,35 @@
  Home page: http://www.fbreader.org/
 XB-Maemo-Icon-26:
  iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABmJLR0QA/wD/
- AP+gvaeTAAAACXBIWXMAAAFDAAABQwEfSBMjAAAAB3RJTUUH1wcdFhwBWmdn
- bAAABCRJREFUSMe9lNtPXFUUxr99bnNjGJj7jQEKUyKUQSNpa2tRY2JsgqL/
- Rl8aNfHRJ+MbJpJQo03FVNoHQ0ysWkyatKkJ5da0CJWb0mFmYOjAXJj79Zzt
- A8w4IQNDx+iXnGSflW+vX/Zaa2/gCBlcAyqDa6C/QvzlA/9yg+vdKxV8g8U1
- dwRELmML163q7OmWc+f9sw8mHrl6T6szMsd4rkB2doD3932CwBRGmhrzfa2v
- XriTyWTHAaizitZbnMpg3JnHR4eC9jd/e6qJ6zXptPZ4InlP/05/IJBWWK0n
- XqN+9+LIvo/jGfFql509azForZls7mYylQ4FUkpdvf2sFA0GFoo5mQoQjmfE
- a1129oxJV+8AAHWdqj6FBqeq6RWShqaukM9qDa4BhmfEK51Wct5i0LQAgFwm
- yOOSxia3n0GG1SvL8zIHIAzPiF91Wsi54mYA8IUkUENPLsXqlaG1CahpsJsj
- 4lCHmb5uMzW0FX3eMAXV9+TTrEF+8ABcGYRwRBzuMKPPZm44UYxvhEWIuh4x
- yZiFqHsKrepd7MaZbqcp73RYdIqibzMigep6pBRr5iu1owTiiPj5SRN902HR
- thdj/ogIUXsKCdbKRtdn0KwMIpkWUcfnSTlka1eEpHUhwVqZw4aLAQBzT/9g
- m5FebLFpnSVIOI9CQycSnANRz0PY5NtIZkQwUgYOS2Mpwfp2FnlNF2Ks/aib
- sgdqbe94T6mqa/+nDBRhSYe40IKobw5mfgstBgFgZYC6GaF4AfkChSfCI04b
- QdXNIqqIA4C33r4YJBD1iwuP1IRTEGOzHeSZN+fxzAt6eNFmkgEA5EoFLl3+
- AD/f/hWhcBgmhxPplbksCJsDRHVVEECp6wWnuqHRCG8gBm8gitBOcLdR9BhP
- 2mQlsyRRyAUeF/regDcQhTcQQwGypyCsGRBxDBBACCl+lBACtVJWT/I8JAow
- BNjcpchKAsr8lBACMEwWx9ChT1BH90sJu6ZX/tv9e6AgUDnawOaSoKCoRYeC
- GJYr9L7YBYPFUSpTcsuHWsU8l5vw/xPoX+g/BUlinq0JRCsuK4vPB5diIf/X
- NYEEnolRir2xPsonhpc2lmeHfVM3r9ZWOklcrQaRSdHljaWZa76pG8M19YgQ
- Qiml+aM8csRXNpambngnRwdrHAZCqzVGwaRWfYuT33sefPdprVNHy6pFK58k
- HfY+mfjRM3H9k+d+GQghmT1IWU+oRKQDqFw6KV+aufOLZ3L046r36M81dySa
- ym2X6BzjfzQ9sfp4dXM8W6BhAGBZ1u13L68PfTlyP5LIhCSQRGh746fglue2
- Z3L0crWysADwLMaMub1+o8QKJBKNb63Mz3zzcOyzSwtrweRfT91ZygqR3yfv
- jv0xPvRhEpq7s9PTheUn84tri3O3Ao9/+OI4Xf4bjmS8Dw4gGSwAAAAASUVO
- RK5CYII=
+ AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QEKFjEFBaQC
+ bAAABStJREFUSMftlsmPXFcVh79zhzfX0Gm3y+20GwcnDomMEJEVAXIk2CAG
+ YaYVEUhs2WWTRRbsQCzZgGADKyT2RkLKAgkiYaJsIkAx3R7iEbvT6a4eqrte
+ Vb07ZFHV7W6TPwAkrnSk867OO997v3N07oX/r//2JQfOlT+9ZT+xdLqXhiBl
+ WTYhENc2Hsn2j9/49MI4LKjLX7u9cPmr7zz9yRf90QTr+7uiXaoGdS1b21uy
+ v9VnY+1RlNCEb3732+E/QN//2a9/+qVLn3/9QmLlxFNt70PD8MN1Vl/7UbJ0
+ 77Ysd8rQPPvstb9++RtXRifPP1VuPlgmNr25qlVOTp1Ni7LU7XbLdMqCTqvw
+ mzvbk9/+4c+j8eLp3/zyB1//uTkAPZr4Z665wr75q5+wt71pyiKn1+pQzs1z
+ dXWV17ulym/fupC9+ccL409tcHH0kPTUaf6tc/bEkmlDqhRaKZI0ocpzbHTs
+ mnwJ4BA09JFoDSsr17hz8zpoQYBQO85OFN/r72CMYrhyHbf4PH2nKUc5e16z
+ s7FJkIi1lixJIQoQiTEiRADUASjPC3yIKGUQLWgRtGhERVCRXQn4xjHyEU9k
+ f+xogiIqM9U/ggiIHKYkxgjyBKjKMyYxYo3BKIM1ljzLKfOCEzi8g2Hj6HuH
+ pMn0a5VCRRCtpr5SKA1KTUtflOUB57F0mTWMG48gJDYlzTKyrCBVwvm9XULj
+ 2PeeD7SmlVXEuEkwBiOC0hpRgiCIKESmvjEJ+CdAIpHBYAgiZFlBVbVotzpk
+ ecqp+zfZH48JUdhpzSPtDlEZnPMYQBmDPG5gEEFESIxlEvxx6SyKwf4eRZ5T
+ lS263S7tToeyrKiMxUdQEhh3u4Q0Q0JAxTBNavSs+LNiAdpoqqrE+SdqZIKj
+ HjWkSUpRlFRVSVHk5EWBa1WUEqmAKNM+SgUSPFpAqWmaOIMIoJWmVRSznSPS
+ RTyT8Zhet8u4HpHlOXmeYWzCZl7RU5okETKtic2YNDqsimA1WmsAQpy2dIwR
+ rYQ0fSzpIagZjXEywugEY+ysIQqKvGA9BpL5ORYTz9lmj2TjIa1OSt7O+SAx
+ s+JD8B7nAsEHtNbkWQZhcFy6wdbONEAprDUYM21xrYXGGv5y5jnM/AlefWaR
+ xa0HlN0MFye4rJjKpYQQPK6Z4BqHKEWZ58gMcfhHdV1Dy9GZn6PfXwcUzjtC
+ tGSfe4V3rr7FP3pPUyc9Xj73AlY79PwSae8EfjxNbLQBEaJERCBJ7KxBjoC0
+ NnSU49IXXqH32UvUJmVdlfTrPfxwh/iZL1KlmnqiWY2OUW+R83MZ81UbY0aI
+ gLEWmySIKEKIpEaBhOOgIkvwSuGLioEkDCYNy8rR155+XlDfvcmWUYgWfFIx
+ HA3pDyFpJqjop1NBCTFmTLwD0YhAnB0UhzVSCKUEnBh6MmK5GdAUBec6GUux
+ Yb9oMxlssPfuVXqjXc5XCWfaOd1OSVEUlGWJtVOpvPf4EDBaMxrVT4ygxPhW
+ YlGDD+kkHVwzonP3PaIQ9drDcXbtn2s3Htx59+b1f71968bKuYsvXXzphedf
+ XDpzZrnd6XSTVquljDGilCARYgj+/dWVv6/+/hdXjh58cvnVH37n5a9863f1
+ yoqcXJjfvv/w3q17d99/e2Xlvb/dv3/vxs7Odj+E4GfvqJnpJEkypXSxsHCy
+ yLM8ESXWWuvrerh2587tW977GggHICUiutXunLLG6MFgUDfNpIkxTgDHdDSG
+ j7kCyMfsxVlsPGLHAg+eD+xY4P/M+ght8RxOZDxGnAAAAABJRU5ErkJggg==
+ ====
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo4/libzlibrary.shlibs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo4/libzlibrary.shlibs
--- fbreader-0.8.17/distributions/debian/maemo4/libzlibrary.shlibs	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/debian/maemo4/libzlibrary.shlibs	2009-04-30 22:26:45.000000000 +0100
@@ -1,2 +1,2 @@
-libzlcore @SOVERSION@ libzlibrary (>= @VERSION@-1), libzlibrary (<< 0.10.0-1)
-libzltext @SOVERSION@ libzlibrary (>= @VERSION@-1), libzlibrary (<< 0.10.0-1)
+libzlcore @SOVERSIONCORE@ libzlibrary (>= @VERSION@-1), libzlibrary (<< 0.11.0-1)
+libzltext @SOVERSIONTEXT@ libzlibrary (>= @VERSION@-1), libzlibrary (<< 0.11.0-1)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/changelog /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/changelog
--- fbreader-0.8.17/distributions/debian/maemo5/changelog	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/changelog	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,200 @@
+fbreader (0.10.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 30 Mar 2009 13:29:00 +0400
+
+fbreader (0.10.6-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thu, 26 Mar 2009 22:15:00 +0200
+
+fbreader (0.10.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2009 18:12:00 +0200
+
+fbreader (0.10.4-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 8 Feb 2009 03:24:00 +0300
+
+fbreader (0.10.0-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 3 Aug 2008 19:01:00 +0400
+
+fbreader (0.8.17-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 23 Mar 2008 03:30:00 +0300
+
+fbreader (0.8.16-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 20 Mar 2008 03:10:00 +0300
+
+fbreader (0.8.15-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Tue, 26 Feb 2008 02:41:00 +0300
+
+fbreader (0.8.14-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 9 Feb 2008 22:48:00 +0300
+
+fbreader (0.8.13-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 24 Jan 2008 15:24:00 +0300
+
+fbreader (0.8.12-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 19 Jan 2008 03:47:00 +0300
+
+fbreader (0.8.11-1) stable; urgency=low
+
+  * new upstream version
+  * dependency rules have been changed
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 12 Jan 2008 22:27:00 +0300
+
+fbreader (0.8.10-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 4 Jan 2008 20:53:00 +0300
+
+fbreader (0.8.9-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 27 Dec 2007 07:13:00 +0300
+
+fbreader (0.8.8d-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 24 Dec 2007 10:27:00 +0300
+
+fbreader (0.8.8c-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sun, 23 Dec 2007 08:14:00 +0300
+
+fbreader (0.8.8b-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 20 Dec 2007 22:30:00 +0300
+
+fbreader (0.8.8a-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Mon, 17 Dec 2007 03:03:00 +0300
+
+fbreader (0.8.8-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 23 Nov 2007 22:55:00 +0300
+
+fbreader (0.8.7b-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Tue, 6 Nov 2007 22:55:00 +0300
+
+fbreader (0.8.7a-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 3 Nov 2007 00:00:00 +0400
+
+fbreader (0.8.7-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Fri, 5 Sep 2007 00:00:00 +0400
+
+fbreader (0.8.6d-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 7 Sep 2007 12:00:00 +0400
+
+fbreader (0.8.6c-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 30 Aug 2007 02:30:00 +0400
+
+fbreader (0.8.6a-1) stable; urgency=low
+
+  * fixed stylus/finger pressing detection problem on Nokia 770 device
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 8 Aug 2007 18:47:00 +0400
+
+fbreader (0.8.6-3) stable; urgency=low
+
+  * fixed fbreader-maemo2 package icon
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 8 Aug 2007 01:55:00 +0400
+
+fbreader (0.8.6-2) stable; urgency=low
+
+  * fixed fbreader-maemo2 package icon
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 8 Aug 2007 01:09:00 +0400
+
+fbreader (0.8.6-1) stable; urgency=low
+
+  * new upstream version
+  * added libzlibrary-dev package
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 5 Aug 2007 23:49:00 +0400
+
+fbreader (0.8.5c-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 19 Jul 2007 15:20:00 +0400
+
+fbreader (0.8.5a-1) stable; urgency=low
+
+  * new upstream version
+  * maemo package icon has been restored
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 7 Jul 2007 02:12:00 +0400
+
+fbreader (0.8.5-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 7 Jul 2007 02:12:00 +0400
+
+fbreader (0.8.4zz-1) stable; urgency=low
+
+  * new upstream version
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Thr, 5 Jul 2007 03:17:00 +0400
+
+fbreader (0.8.4z-1) stable; urgency=low
+
+  * Initial release.
+
+ -- Nikolay Pultsin <geometer@fbreader.org>  Sat, 30 Jun 2007 01:48:00 +0400
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/compat /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/compat
--- fbreader-0.8.17/distributions/debian/maemo5/compat	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/compat	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+4
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/control /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/control
--- fbreader-0.8.17/distributions/debian/maemo5/control	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/control	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,79 @@
+Source: fbreader
+Priority: optional
+Maintainer: Nikolay Pultsin <geometer@fbreader.org>
+Standards-Version: 3.6.1
+Build-Depends: debhelper, libexpat1-dev, libbz2-dev, libz-dev, libhildon1-dev, libosso-dev, liblinebreak-dev, libfribidi-dev, libcurl3-dev
+
+Package: libzlibrary
+Section: user/libs
+Priority: optional
+Architecture: armel i386
+Conflicts: fbreader (<< 0.8.0)
+Depends: ${shlibs:Depends}
+Description: Platform-dependent part of fbreader
+ Home page: http://www.fbreader.org/
+
+Package: libzlibrary-dev
+Section: libdevel
+Priority: optional
+Architecture: armel i386
+Depends: libzlibrary (= ${Source-Version})
+Description: zlibrary - development files
+ Home page: http://www.fbreader.org/
+
+Package: fbreader
+Section: user/tools
+Priority: optional
+Architecture: armel i386
+Depends: ${shlibs:Depends}
+Description: e-book reader
+ FBReader is an e-book reader for UNIX/Windows computers.
+ .
+ Main features:
+  * supports several open e-book formats: fb2, html, chm, plucker,
+    palmdoc, ztxt, tcr (psion text), rtf, oeb, openreader, non-DRM'ed
+    mobipocket, plain text
+  * reads directly from tar, zip, gzip, bzip2 archives (you can have
+    several books in one archive)
+  * supports structured view for your e-book collection
+  * automatically determines encoding
+  * automatically generates table of contents
+  * keeps the last open book and the last read positions for all open books
+    between runs
+  * automatic hyphenation (patterns for several languages are included)
+ .
+ Home page: http://www.fbreader.org/
+XB-Maemo-Icon-26:
+ iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABmJLR0QA/wD/
+ AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2QEKFjEFBaQC
+ bAAABStJREFUSMftlsmPXFcVh79zhzfX0Gm3y+20GwcnDomMEJEVAXIk2CAG
+ YaYVEUhs2WWTRRbsQCzZgGADKyT2RkLKAgkiYaJsIkAx3R7iEbvT6a4eqrte
+ Vb07ZFHV7W6TPwAkrnSk867OO997v3N07oX/r//2JQfOlT+9ZT+xdLqXhiBl
+ WTYhENc2Hsn2j9/49MI4LKjLX7u9cPmr7zz9yRf90QTr+7uiXaoGdS1b21uy
+ v9VnY+1RlNCEb3732+E/QN//2a9/+qVLn3/9QmLlxFNt70PD8MN1Vl/7UbJ0
+ 77Ysd8rQPPvstb9++RtXRifPP1VuPlgmNr25qlVOTp1Ni7LU7XbLdMqCTqvw
+ mzvbk9/+4c+j8eLp3/zyB1//uTkAPZr4Z665wr75q5+wt71pyiKn1+pQzs1z
+ dXWV17ulym/fupC9+ccL409tcHH0kPTUaf6tc/bEkmlDqhRaKZI0ocpzbHTs
+ mnwJ4BA09JFoDSsr17hz8zpoQYBQO85OFN/r72CMYrhyHbf4PH2nKUc5e16z
+ s7FJkIi1lixJIQoQiTEiRADUASjPC3yIKGUQLWgRtGhERVCRXQn4xjHyEU9k
+ f+xogiIqM9U/ggiIHKYkxgjyBKjKMyYxYo3BKIM1ljzLKfOCEzi8g2Hj6HuH
+ pMn0a5VCRRCtpr5SKA1KTUtflOUB57F0mTWMG48gJDYlzTKyrCBVwvm9XULj
+ 2PeeD7SmlVXEuEkwBiOC0hpRgiCIKESmvjEJ+CdAIpHBYAgiZFlBVbVotzpk
+ ecqp+zfZH48JUdhpzSPtDlEZnPMYQBmDPG5gEEFESIxlEvxx6SyKwf4eRZ5T
+ lS263S7tToeyrKiMxUdQEhh3u4Q0Q0JAxTBNavSs+LNiAdpoqqrE+SdqZIKj
+ HjWkSUpRlFRVSVHk5EWBa1WUEqmAKNM+SgUSPFpAqWmaOIMIoJWmVRSznSPS
+ RTyT8Zhet8u4HpHlOXmeYWzCZl7RU5okETKtic2YNDqsimA1WmsAQpy2dIwR
+ rYQ0fSzpIagZjXEywugEY+ysIQqKvGA9BpL5ORYTz9lmj2TjIa1OSt7O+SAx
+ s+JD8B7nAsEHtNbkWQZhcFy6wdbONEAprDUYM21xrYXGGv5y5jnM/AlefWaR
+ xa0HlN0MFye4rJjKpYQQPK6Z4BqHKEWZ58gMcfhHdV1Dy9GZn6PfXwcUzjtC
+ tGSfe4V3rr7FP3pPUyc9Xj73AlY79PwSae8EfjxNbLQBEaJERCBJ7KxBjoC0
+ NnSU49IXXqH32UvUJmVdlfTrPfxwh/iZL1KlmnqiWY2OUW+R83MZ81UbY0aI
+ gLEWmySIKEKIpEaBhOOgIkvwSuGLioEkDCYNy8rR155+XlDfvcmWUYgWfFIx
+ HA3pDyFpJqjop1NBCTFmTLwD0YhAnB0UhzVSCKUEnBh6MmK5GdAUBec6GUux
+ Yb9oMxlssPfuVXqjXc5XCWfaOd1OSVEUlGWJtVOpvPf4EDBaMxrVT4ygxPhW
+ YlGDD+kkHVwzonP3PaIQ9drDcXbtn2s3Htx59+b1f71968bKuYsvXXzphedf
+ XDpzZrnd6XSTVquljDGilCARYgj+/dWVv6/+/hdXjh58cvnVH37n5a9863f1
+ yoqcXJjfvv/w3q17d99/e2Xlvb/dv3/vxs7Odj+E4GfvqJnpJEkypXSxsHCy
+ yLM8ESXWWuvrerh2587tW977GggHICUiutXunLLG6MFgUDfNpIkxTgDHdDSG
+ j7kCyMfsxVlsPGLHAg+eD+xY4P/M+ght8RxOZDxGnAAAAABJRU5ErkJggg==
+ ====
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/fbreader.postinst /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/fbreader.postinst
--- fbreader-0.8.17/distributions/debian/maemo5/fbreader.postinst	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/fbreader.postinst	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+if [ -x /usr/bin/gtk-update-icon-cache ]
+then
+  /usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor
+fi
+
+if [ -x /usr/bin/update-desktop-database ]
+then
+  /usr/bin/update-desktop-database
+fi
+
+if [ -x /usr/bin/update-mime-database ]
+then
+  /usr/bin/update-mime-database /usr/share/mime
+fi
+
+if [ "$1" = "configure" -a -z "$2" -a -x /usr/bin/maemo-select-menu-location ]
+then
+	/usr/bin/maemo-select-menu-location FBReader.desktop
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/fbreader.postrm /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/fbreader.postrm
--- fbreader-0.8.17/distributions/debian/maemo5/fbreader.postrm	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/fbreader.postrm	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+if [ -x /usr/bin/gtk-update-icon-cache ]
+then
+  /usr/bin/gtk-update-icon-cache -f /usr/share/icons/hicolor
+fi
+
+if [ -x /usr/bin/update-desktop-database ]
+then
+  /usr/bin/update-desktop-database
+fi
+
+if [ -x /usr/bin/update-mime-database ]
+then
+  /usr/bin/update-mime-database /usr/share/mime
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/libzlibrary.postinst /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/libzlibrary.postinst
--- fbreader-0.8.17/distributions/debian/maemo5/libzlibrary.postinst	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/libzlibrary.postinst	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/libzlibrary.postrm /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/libzlibrary.postrm
--- fbreader-0.8.17/distributions/debian/maemo5/libzlibrary.postrm	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/libzlibrary.postrm	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/libzlibrary.shlibs /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/libzlibrary.shlibs
--- fbreader-0.8.17/distributions/debian/maemo5/libzlibrary.shlibs	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/libzlibrary.shlibs	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,2 @@
+libzlcore @SOVERSIONCORE@ libzlibrary (>= @VERSION@-1), libzlibrary (<< 0.11.0-1)
+libzltext @SOVERSIONTEXT@ libzlibrary (>= @VERSION@-1), libzlibrary (<< 0.11.0-1)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/debian/maemo5/rules /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/debian/maemo5/rules
--- fbreader-0.8.17/distributions/debian/maemo5/rules	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/distributions/debian/maemo5/rules	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,66 @@
+#!/usr/bin/make -f
+## ----------------------------------------------------------------------
+## debian/rules : package script for fbreader
+## ----------------------------------------------------------------------
+
+## ----------------------------------------------------------------------
+## uncomment this to turn on verbose mode
+#export DH_VERBOSE=1
+
+## ----------------------------------------------------------------------
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+## ----------------------------------------------------------------------
+DEB_DIR		= $(CURDIR)/debian
+
+## ----------------------------------------------------------------------
+## targets
+
+clean:
+		dh_testdir
+		dh_testroot
+		[ ! -f Makefile ] || $(MAKE) distclean
+		dh_clean build-stamp install-stamp
+
+build:		build-stamp
+build-stamp:
+		dh_testdir
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo5
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo5
+		$(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo5
+		$(MAKE) -C fbreader TARGET_ARCH=maemo UI_TYPE=maemo5
+		touch build-stamp 
+
+install:	install-stamp
+install-stamp:	build
+		dh_testdir
+		dh_testroot
+		dh_clean -k
+		dh_installdirs
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo5 DESTDIR=$(DEB_DIR)/libzlibrary do_install
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo5 DESTDIR=$(DEB_DIR)/libzlibrary do_install
+		$(MAKE) -C zlibrary/ui TARGET_ARCH=maemo UI_TYPE=maemo5 DESTDIR=$(DEB_DIR)/libzlibrary do_install
+		$(MAKE) -C fbreader TARGET_ARCH=maemo UI_TYPE=maemo5 DESTDIR=$(DEB_DIR)/fbreader do_install
+		$(MAKE) -C zlibrary/core TARGET_ARCH=maemo UI_TYPE=maemo5 DESTDIR=$(DEB_DIR)/libzlibrary-dev do_install_dev
+		$(MAKE) -C zlibrary/text TARGET_ARCH=maemo UI_TYPE=maemo5 DESTDIR=$(DEB_DIR)/libzlibrary-dev do_install_dev
+		touch install-stamp
+
+binary-indep:
+
+binary-arch:	build install
+		dh_testdir
+		dh_testroot
+		dh_compress -a
+		dh_fixperms -a
+		dh_installdeb -a
+		dh_shlibdeps -a -l $(DEB_DIR)/libzlibrary/usr/lib
+		dh_gencontrol -a
+		dh_md5sums -a
+		dh_builddeb -a
+
+binary:		binary-indep binary-arch
+
+.PHONY:		clean build install binary-indep binary-arch binary
+
+## ----------------------------------------------------------------------
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/distributions/nsi/win32/control.nsi /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/distributions/nsi/win32/control.nsi
--- fbreader-0.8.17/distributions/nsi/win32/control.nsi	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/distributions/nsi/win32/control.nsi	2009-04-30 22:26:45.000000000 +0100
@@ -39,9 +39,14 @@
 	ReadRegStr $0 HKCU "Software\FBReader\options\Options" "BookPath"
 	StrCmp $0 "" 0 +2
 	WriteRegStr HKCU "Software\FBReader\options\Options" "BookPath" "C:\Books;$PROFILE\Books" 
+	ReadRegStr $0 HKCU "Software\FBReader\options\Options" "DownloadDirectory"
+	StrCmp $0 "" 0 +2
+	WriteRegStr HKCU "Software\FBReader\options\Options" "DownloadDirectory" "$PROFILE\Books" 
 	WriteRegStr HKCU "Software\FBReader\options\PlatformOptions" "TouchScreenPresented" "true" 
 	WriteRegStr HKCU "Software\FBReader\options\PlatformOptions" "MousePresented" "true" 
 	WriteRegStr HKCU "Software\FBReader\options\PlatformOptions" "KeyboardPresented" "true" 
+	WriteRegStr HKCU "Software\FBReader\options\Options" "LeftMargin" "50" 
+	WriteRegStr HKCU "Software\FBReader\options\Options" "RightMargin" "50" 
 	WriteRegStr HKCU "Software\FBReader\options\Options" "KeyDelay" "0" 
 	WriteRegStr HKCU "Software\FBReader\options\SmallScrolling" "ScrollingDelay" "true" 
 	WriteRegStr HKCU "Software\FBReader\options\LargeScrolling" "ScrollingDelay" "true" 
@@ -53,8 +58,13 @@
 SectionEnd
 
 Section "Uninstall"
-	RMDir /r "$INSTDIR\share"
+	ClearErrors
 	Delete "$INSTDIR\FBReader.exe"
+	IfErrors 0 ContinueUninstallation
+		MessageBox MB_OK "Cannot uninstall FBReader while the program is running.$\nPlease quit FBReader and try again."
+		Quit
+	ContinueUninstallation:
+	RMDir /r "$INSTDIR\share"
 	Delete "$INSTDIR\*.dll"
 	Delete "$INSTDIR\*.license"
 	Delete "$INSTDIR\uninstall.exe"
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.desktop.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.desktop.xml
--- fbreader-0.8.17/fbreader/data/default/config.desktop.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.desktop.xml	2009-04-30 22:26:45.000000000 +0100
@@ -10,7 +10,10 @@
     <option name="Enabled" value="false"/>
   </group>
   <group name="Options">
+    <option name="LeftMargin" value="50"/>
+    <option name="RightMargin" value="50"/>
     <option name="KeyDelay" value="0"/>
     <option name="BookPath" value="~/FBooks:~/Books"/>
+    <option name="DownloadDirectory" value="~/FBooks"/>
   </group>
 </config>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.maemo.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.maemo.xml
--- fbreader-0.8.17/fbreader/data/default/config.maemo.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.maemo.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
   <group name="Options">
-    <option name="BookPath" value="~/MyDocs/Books:/media/mmc1/Books"/>
+    <option name="Timeout" value="30"/>
+    <option name="LeftMargin" value="20"/>
+    <option name="TopMargin" value="4"/>
+    <option name="BookPath" value="~/MyDocs/Books:/media/mmc1/Books:/media/mmc2/Books"/>
+    <option name="DownloadDirectory" value="~/MyDocs/Books"/>
   </group>
 </config>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.moto.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.moto.xml
--- fbreader-0.8.17/fbreader/data/default/config.moto.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.moto.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,6 +2,7 @@
 <config>
 	<group name="Options">
 		<option name="BookPath" value="/mmc/mmca1/books/fiction"/>
+		<option name="DownloadDirectory" value="/mmc/mmca1/books/fiction"/>
 		<option name="IsSelectionEnabled" value="false"/>
 		<option name="BottomMargin" value="3"/>
 		<option name="LeftMargin" value="3"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.openzaurus.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.openzaurus.xml
--- fbreader-0.8.17/fbreader/data/default/config.openzaurus.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.openzaurus.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,6 +2,7 @@
 <config>
   <group name="Options">
     <option name="BookPath" value="/media/cf/FBooks:~/FBooks"/>
+    <option name="DownloadDirectory" value="~/FBooks"/>
   </group>
   <group name="TapScrolling">
     <option name="Enabled" value="false"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.opie.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.opie.xml
--- fbreader-0.8.17/fbreader/data/default/config.opie.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.opie.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,6 +2,7 @@
 <config>
   <group name="Options">
     <option name="BookPath" value="~/FBooks:~/Books"/>
+    <option name="DownloadDirectory" value="~/FBooks"/>
   </group>
   <group name="TapScrolling">
     <option name="Enabled" value="false"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.pdaxrom.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.pdaxrom.xml
--- fbreader-0.8.17/fbreader/data/default/config.pdaxrom.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.pdaxrom.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,6 +2,7 @@
 <config>
   <group name="Options">
     <option name="BookPath" value="/mnt/card/FBooks:/mnt/cf/FBooks"/>
+    <option name="DownloadDirectory" value="/mnt/card/FBooks"/>
   </group>
   <group name="TapScrolling">
     <option name="Enabled" value="false"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.pepperpad3.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.pepperpad3.xml
--- fbreader-0.8.17/fbreader/data/default/config.pepperpad3.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.pepperpad3.xml	2009-04-30 22:26:45.000000000 +0100
@@ -12,5 +12,6 @@
   <group name="Options">
     <option name="KeyDelay" value="0"/>
     <option name="BookPath" value="~/FBooks:~/Books"/>
+    <option name="DownloadDirectory" value="~/FBooks"/>
   </group>
 </config>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.pma400.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.pma400.xml
--- fbreader-0.8.17/fbreader/data/default/config.pma400.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.pma400.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,6 +2,7 @@
 <config>
   <group name="Options">
     <option name="BookPath" value="~/Documents/FBooks:~/Documents/Books"/>
+    <option name="DownloadDirectory" value="~/Documents/FBooks"/>
   </group>
   <group name="TapScrolling">
     <option name="Enabled" value="false"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/config.zaurus.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/config.zaurus.xml
--- fbreader-0.8.17/fbreader/data/default/config.zaurus.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/config.zaurus.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,6 +2,7 @@
 <config>
   <group name="Options">
     <option name="BookPath" value="/mnt/card/FBooks:~/Documents/FBooks"/>
+    <option name="DownloadDirectory" value="~/Documents/FBooks"/>
   </group>
   <group name="TapScrolling">
     <option name="Enabled" value="false"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/fullscreen_toolbar.desktop.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/fullscreen_toolbar.desktop.xml
--- fbreader-0.8.17/fbreader/data/default/fullscreen_toolbar.desktop.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/default/fullscreen_toolbar.desktop.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<toolbar>
+</toolbar>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/keymap.desktop.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/keymap.desktop.xml
--- fbreader-0.8.17/fbreader/data/default/keymap.desktop.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/keymap.desktop.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keymap>
 	<binding key="&lt;L&gt;" action="showLibrary"/>
+	<binding key="&lt;W&gt;" action="showNetLibrary"/>
 	<binding key="&lt;O&gt;" action="preferences"/>
 	<binding key="&lt;LeftArrow&gt;" action="undo"/>
 	<binding key="&lt;RightArrow&gt;" action="redo"/>
@@ -27,7 +28,6 @@
 	<binding key="&lt;A&gt;" action="addBook"/>
 	<binding key="&lt;I&gt;" action="bookInfo"/>
 	<binding key="&lt;R&gt;" action="rotate"/>
-	<binding key="&lt;Z&gt;" action="showRecent"/>
 	<binding key="&lt;Ctrl&gt;+&lt;DownArrow&gt;" action="nextTOCSection"/>
 	<binding key="&lt;Ctrl&gt;+&lt;UpArrow&gt;" action="previousTOCSection"/>
 	<binding key="&lt;Ctrl&gt;+&lt;C&gt;" action="copyToClipboard"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.240x320.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.240x320.xml
--- fbreader-0.8.17/fbreader/data/default/styles.240x320.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.240x320.xml	2009-04-30 22:26:45.000000000 +0100
@@ -14,14 +14,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.640x480.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.640x480.xml
--- fbreader-0.8.17/fbreader/data/default/styles.640x480.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.640x480.xml	2009-04-30 22:26:45.000000000 +0100
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="30" firstLineIndentDelta="-30" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="30" firstLineIndentDelta="-30" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.desktop.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.desktop.xml
--- fbreader-0.8.17/fbreader/data/default/styles.desktop.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.desktop.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <DefaultStyles>
 	<base family="Georgia" fontSize="16"/>
-	<style id="0" name="Regular Paragraph" firstLineIndentDelta="20" allowHyphenations="true"/>
+	<style id="0" name="Regular Paragraph" firstLineIndentDelta="40" allowHyphenations="true"/>
 	<style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
 	<style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/>
 	<style id="2" name="Section Title" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="20" firstLineIndentDelta="-20" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.gpe240x320.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.gpe240x320.xml
--- fbreader-0.8.17/fbreader/data/default/styles.gpe240x320.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.gpe240x320.xml	2009-04-30 22:26:45.000000000 +0100
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.gpe640x480.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.gpe640x480.xml
--- fbreader-0.8.17/fbreader/data/default/styles.gpe640x480.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.gpe640x480.xml	2009-04-30 22:26:45.000000000 +0100
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="22" firstLineIndentDelta="-22" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="22" firstLineIndentDelta="-22" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.maemo.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.maemo.xml
--- fbreader-0.8.17/fbreader/data/default/styles.maemo.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.maemo.xml	2009-04-30 22:26:45.000000000 +0100
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="22" firstLineIndentDelta="-22" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="22" firstLineIndentDelta="-22" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.moto.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.moto.xml
--- fbreader-0.8.17/fbreader/data/default/styles.moto.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.moto.xml	2009-04-30 22:26:45.000000000 +0100
@@ -14,14 +14,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="15" firstLineIndentDelta="-15" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="15" firstLineIndentDelta="-15" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.pepperpad3.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.pepperpad3.xml
--- fbreader-0.8.17/fbreader/data/default/styles.pepperpad3.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.pepperpad3.xml	2009-04-30 22:26:45.000000000 +0100
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="20" firstLineIndentDelta="-20" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/styles.win32.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/styles.win32.xml
--- fbreader-0.8.17/fbreader/data/default/styles.win32.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/styles.win32.xml	2009-04-30 22:26:45.000000000 +0100
@@ -18,14 +18,13 @@
 	<style id="8" name="Verse" leftIndent="20" alignment="left" allowHyphenations="false"/>
 	<style id="10" name="Image" spaceBefore="8" alignment="center"/>
 	<style id="23" name="Contents Table" spaceAfter="7" leftIndent="20" firstLineIndentDelta="-20" alignment="left"/>
-	<style id="24" name="Author in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="25" name="Book in Library" fontSizeDelta="-2" alignment="left" allowHyphenations="false"/>
-	<style id="26" name="Recent Book List" spaceAfter="3" leftIndent="20" firstLineIndentDelta="-20" alignment="left" lineSpacingPercent="120"/>
+	<style id="25" name="Library Entry" alignment="left" allowHyphenations="false"/>
 	<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="38" partial="true" name="Link to Another Book" allowHyphenations="false" hyperlink="book"/>
 	<style id="16" partial="true" name="Footnote" fontSizeDelta="-6" vShift="10" allowHyphenations="false" hyperlink="internal"/>
 	<style id="17" partial="true" name="Emphasis" italic="true"/>
 	<style id="18" partial="true" name="Strong" bold="true"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/toolbar.desktop.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/toolbar.desktop.xml
--- fbreader-0.8.17/fbreader/data/default/toolbar.desktop.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/default/toolbar.desktop.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<toolbar>
+	<button id="showReading"/>
+	<separator/>
+	<toggleButton id="byAuthor" group="booksOrder" default="yes"/>
+	<toggleButton id="byTag" group="booksOrder"/>
+	<separator/>
+	<menuButton id="showLibrary"/>
+	<button id="addBook"/>
+	<button id="showNetLibrary"/>
+	<separator/>
+	<button id="advancedSearchOnNetwork"/>
+	<textField id="searchOnNetwork" parameterId="networkSearchPattern" maxWidth="25"/>
+	<separator/>
+	<button id="gotoHome"/>
+	<button id="undo"/>
+	<button id="redo"/>
+	<textField id="gotoPageNumberWithParameter" parameterId="pageIndex" maxWidth="5" symbols="digits"/>
+	<separator/>
+	<button id="toc"/>
+	<separator/>
+	<button id="search"/>
+	<button id="findPrevious"/>
+	<button id="findNext"/>
+	<separator/>
+	<button id="bookInfo"/>
+	<button id="preferences"/>
+	<separator/>
+	<button id="rotate"/>
+	<separator/>
+	<button id="showHelp"/>
+</toolbar>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/toolbar.full.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/toolbar.full.xml
--- fbreader-0.8.17/fbreader/data/default/toolbar.full.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/toolbar.full.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <toolbar>
+	<button id="showReading"/>
+	<separator/>
 	<button id="showLibrary"/>
 	<button id="showRecent"/>
 	<button id="addBook"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/toolbar.maemo.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/toolbar.maemo.xml
--- fbreader-0.8.17/fbreader/data/default/toolbar.maemo.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/default/toolbar.maemo.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<toolbar>
+	<button id="showReading"/>
+	<separator/>
+	<toggleButton id="byAuthor" group="booksOrder" default="yes"/>
+	<toggleButton id="byTag" group="booksOrder"/>
+	<separator/>
+	<menuButton id="showLibrary"/>
+	<button id="addBook"/>
+	<button id="showNetLibrary"/>
+	<separator/>
+	<button id="advancedSearchOnNetwork"/>
+	<textField id="searchOnNetwork" parameterId="networkSearchPattern" maxWidth="25"/>
+	<separator/>
+	<button id="gotoHome"/>
+	<button id="undo"/>
+	<button id="redo"/>
+	<textField id="gotoPageNumberWithParameter" parameterId="pageIndex" maxWidth="4" symbols="digits"/>
+	<button id="toc"/>
+	<separator/>
+	<button id="search"/>
+	<button id="findPrevious"/>
+	<button id="findNext"/>
+	<button id="rotate"/>
+</toolbar>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/toolbar.short.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/toolbar.short.xml
--- fbreader-0.8.17/fbreader/data/default/toolbar.short.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/toolbar.short.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <toolbar>
+	<button id="showReading"/>
+	<separator/>
 	<button id="showLibrary"/>
 	<button id="showRecent"/>
 	<button id="addBook"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/default/toolbar.zaurus.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/default/toolbar.zaurus.xml
--- fbreader-0.8.17/fbreader/data/default/toolbar.zaurus.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/default/toolbar.zaurus.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <toolbar>
+	<button id="showReading"/>
+	<separator/>
 	<button id="showLibrary"/>
 	<button id="showRecent"/>
 	<button id="addBook"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/formats/xhtml/xhtml-special.ent /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/formats/xhtml/xhtml-special.ent
--- fbreader-0.8.17/fbreader/data/formats/xhtml/xhtml-special.ent	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/formats/xhtml/xhtml-special.ent	2009-04-30 22:26:45.000000000 +0100
@@ -21,13 +21,6 @@
      character set. Names are Unicode names. 
 -->
 
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
-
 <!-- Latin Extended-A -->
 <!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
                                     U+0152 ISOlat2 -->
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.240x320.en.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.240x320.en.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.240x320.en.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.240x320.en.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>About FBReader &FBReaderVersion;</p></title>
 <p>FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
 <p>FBReader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>If you like the program and would like to support its development, please visit <a l:href="http://www.fbreader.org/donation/make.php">make donation</a> page.</p>
 <empty-line/>
 <subtitle><p>How To Start</p></subtitle>
 <p>FBReader looks for <code>fb2</code>, <code>oeb</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png" voffset="-6"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> or archive files. Directories in the list are separated by colons.</p>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.240x320.fi.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.240x320.fi.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.240x320.fi.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.240x320.fi.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -6,9 +6,9 @@
 <p>FBReader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla.</p>
 <empty-line/>
 <subtitle><p>Aloitusohje</p></subtitle>
-<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston polku</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston polku</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
+<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
 <p>Avaa <code>kirjasto</code> (työkalupalkin <image l:href="#books.png" voffset="-6"/>-kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.</p>
-<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muokkaa kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
+<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
 <empty-line/>
 <subtitle><p>Liittyvät sivustot</p></subtitle>
 <p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">FBReaderin kotisivulta</a>.</p>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.240x320.id.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.240x320.id.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.240x320.id.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.240x320.id.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>Mengenai FBReader &FBReaderVersion;</p></title>
 <p>FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
 <p>FBReader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman <a l:href="http://www.fbreader.org/donation/make.php">pemberian donasi</a>.</p>
 <empty-line/>
 <subtitle><p>Bagaimana Memulainya</p></subtitle>
 <p>FBReader mencari buku format <code>fb2</code>, <code>oeb</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon <image l:href="#settings.png" voffset="-6"/> di toolbar) dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.</p>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.640x480.en.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.640x480.en.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.640x480.en.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.640x480.en.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>About FBReader &FBReaderVersion;</p></title>
 <p>FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
 <p>FBReader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>If you like the program and would like to support its development, please visit <a l:href="http://www.fbreader.org/donation/make.php">make donation</a> page.</p>
 <empty-line/>
 <subtitle><p>How To Start</p></subtitle>
 <p>FBReader looks for <code>fb2</code>, <code>oeb</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png" voffset="-6"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> or archive files. Directories in the list are separated by colons.</p>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.640x480.fi.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.640x480.fi.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.640x480.fi.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.640x480.fi.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -6,9 +6,9 @@
 <p>FBReader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla.</p>
 <empty-line/>
 <subtitle><p>Aloitusohje</p></subtitle>
-<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston polku</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston polku</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
+<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
 <p>Avaa <code>kirjasto</code> (työkalupalkin <image l:href="#books.png" voffset="-6"/>-kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.</p>
-<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muokkaa kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
+<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
 <empty-line/>
 <subtitle><p>Liittyvät sivustot</p></subtitle>
 <p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">FBReaderin kotisivulta</a>.</p>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.640x480.id.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.640x480.id.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.640x480.id.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.640x480.id.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>Mengenai FBReader &FBReaderVersion;</p></title>
 <p>FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
 <p>FBReader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman <a l:href="http://www.fbreader.org/donation/make.php">pemberian donasi</a>.</p>
 <empty-line/>
 <subtitle><p>Bagaimana Memulainya</p></subtitle>
 <p>FBReader mencari buku format <code>fb2</code>, <code>oeb</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon <image l:href="#settings.png" voffset="-6"/> di toolbar) dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.</p>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.cs.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.cs.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.cs.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.cs.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>cs</lang></title-info></description>
+<body>
+<title><p>O programu FBReader &FBReaderVersion;</p></title>
+<p>FBReader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. FBReader podporuje následující formáty elektronických knih: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, atd. Přímé čtení archivů <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> je též podporováno.</p>
+<p>FBReader je šířen pod licencí <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Máte-li zájem o tento program a chcete-li podpořit jeho vývoj, navštivte prosím <a l:href="http://www.fbreader.org/donation/make.php">stránku příspěvků</a>.</p>
+<empty-line/>
+<subtitle><p>Jak začít</p></subtitle>
+<p>FBReader hledá knihy ve formátech <code>fb2</code>, <code>oeb</code> a <code>OpenReader</code> v cestě zadaných v parametru <code>Složka s knihami</code>. Nejprve nastavte tento parametr. Otevřete dialog s nastavením (kliknutím na položku <image l:href="#settings.png" voffset="-6"/> v panelu nástrojů) a změňte hodnotu parametru <code>Složka s knihami</code> v záložce <code>Knihovna</code>. Uvedený parametr obsahuje seznam adresářů se soubory <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.</p>
+<p>Otevřete <code>knihovnu</code> (kliknutím na <image l:href="#books.png" voffset="-6"/>), vyberte knihu, kterou chcete číst ze seznamu.</p>
+<p>Pro čtení souboru v jiném formátu je nezbytné jeho zařazení do knihovny. Začněte <code>na vložení knihy do knihovny</code> (<image l:href="#addbook.png"/>), vyberte soubor a editujte informace o něm. Další otevření souboru uskutečněte pomocí <code>knihovny</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Odkazy</p></subtitle>
+<p>Více informací o programu najdete na <a l:href="http://www.fbreader.org">Domovské stránce programu FBReader</a>.</p>
+<p>Pro upozornění na nové verze se prosím přihlaste <a l:href="http://freshmeat.net/projects/fbreader">FBReader projekt na freshmeatu</a>.</p>
+<p>Pro vaše otázky a návrhy použijte prosím <a l:href="http://groups.google.com/group/fbreader">skupinu věnovanou programu FBReader na googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.en.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.en.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.en.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.en.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>About FBReader &FBReaderVersion;</p></title>
 <p>FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
 <p>FBReader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>If you like the program and would like to support its development, please visit <a l:href="http://www.fbreader.org/donation/make.php">make donation</a> page.</p>
 <empty-line/>
 <subtitle><p>How To Start</p></subtitle>
 <p>FBReader looks for <code>fb2</code>, <code>oeb</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png" voffset="-6"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> or archive files. Directories in the list are separated by colons.</p>
@@ -16,120 +17,180 @@
 <p>If you have any questions or suggestions, please use <a l:href="http://groups.google.com/group/fbreader">FBReader group at googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.fi.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.fi.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.fi.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.fi.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -6,9 +6,9 @@
 <p>FBReader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla.</p>
 <empty-line/>
 <subtitle><p>Aloitusohje</p></subtitle>
-<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston polku</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston polku</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
+<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
 <p>Avaa <code>kirjasto</code> (työkalupalkin <image l:href="#books.png" voffset="-6"/>-kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.</p>
-<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muokkaa kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
+<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
 <empty-line/>
 <subtitle><p>Liittyvät sivustot</p></subtitle>
 <p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">FBReaderin kotisivulta</a>.</p>
@@ -16,120 +16,180 @@
 <p>Jos sinulla on kysymyksiä tai ehdotuksia, käytä <a l:href="http://groups.google.com/group/fbreader">FBReader-ryhmää googlegroups palvelussa</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.fr.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.fr.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.fr.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.fr.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -16,120 +16,180 @@
 <p>Si vous avez des questions ou des suggestions, veuillez utiliser le <a l:href="http://groups.google.com/group/fbreader">groupe FBReader de googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.id.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.id.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.id.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.id.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>Mengenai FBReader &FBReaderVersion;</p></title>
 <p>FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
 <p>FBReader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman <a l:href="http://www.fbreader.org/donation/make.php">pemberian donasi</a>.</p>
 <empty-line/>
 <subtitle><p>Bagaimana Memulainya</p></subtitle>
 <p>FBReader mencari buku format <code>fb2</code>, <code>oeb</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon <image l:href="#settings.png" voffset="-6"/> di toolbar) dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.</p>
@@ -16,120 +17,180 @@
 <p>Jika Anda memiliki pertanyaan atau masukan, silakan gunakan <a l:href="http://groups.google.com/group/fbreader">grup FBReader di googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.it.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.it.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.it.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.it.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -16,120 +16,180 @@
 <p>Se hai domande o suggerimenti, per favore usa il <a l:href="http://groups.google.com/group/fbreader">gruppo di FBReader su google gruppi</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.ru.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.ru.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.ru.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.ru.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -1,135 +1,195 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>� ��������� FBReader</book-title> <lang>ru</lang></title-info></description>
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>О программе FBReader</book-title> <lang>ru</lang></title-info></description>
 <body>
-<title><p>� ��������� FBReader &FBReaderVersion;</p></title>
-<p>FBReader &#8211; ��������� ��� ������ ����������� ����, ���������� ��� ������������� ��������� Linux, FreeBSD, Windows XP. FBReader ��������� ������ ����� �� ������ ��������: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, �&#160;�.&#160;�. ����� ����� ������ �������� �� ������� <code>zip</code>, <code>tar</code>, <code>gzip</code> � <code>bzip2</code>.</p>
-<p>FBReader ���������������� ��������, ������� �������� ������, ��� ��������� <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<title><p>О программе FBReader &FBReaderVersion;</p></title>
+<p>FBReader &#8211; программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. FBReader позволяет читать книги во многих форматах: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и&#160;т.&#160;д. Файлы можно читать напрямую из архивов <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
+<p>FBReader распространяется свободно, включая исходные тексты, под лицензией <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
 <empty-line/>
-<subtitle><p>� ���� ������</p></subtitle>
-<p>FBReader ������������� �������� � ���������� ����� �������� <code>fb2</code>, <code>oeb</code> � <code>OpenReader</code>, ������� � ���������, �������� ���������� <code>&#171;�������� � �������&#187;</code>. ������� ������ ����� ����� ���������� ���� ��������. �������� ������ �������� (������� �� ������ <image l:href="#settings.png" voffset="-6"/>) � ������������� <code>&#171;�������� � �������&#187;</code> � ������� <code>&#171;����������&#187;</code>. �������� ������������� ����� ���������, � ���� ��������� ������ ������ ����� � ������������ <code>fb2</code>, <code>oebzip</code> ��� <code>orb</code>, ��� ���������� �� ������.</p>
-<p>������ �������� <code>����������</code> (������� �� <image l:href="#books.png" voffset="-6"/>), �������� �����, � ����������� � ������.</p>
-<p>����� ������ ����� � ������ �������, �� ����� ������� �������� � ����������. ��������� <code>������ ���������� �����</code> (<image l:href="#addbook.png"/>), �������� ���� � �������������� ���������� � �����. � ��������� ��� �� ������� ������� ��� ����� ��� � ������� <code>����������</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<subtitle><p>С чего начать</p></subtitle>
+<p>FBReader автоматически собирает в библиотеку файлы форматов <code>fb2</code>, <code>oeb</code> и <code>OpenReader</code>, лежащие в каталогах, заданных параметром <code>&#171;Каталоги с книгами&#187;</code>. Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек (нажмите на кнопку <image l:href="#settings.png" voffset="-6"/>) и отредактруйте <code>&#171;каталоги с книгами&#187;</code> в разделе <code>&#171;Библиотека&#187;</code>. Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями <code>fb2</code>, <code>oebzip</code> или <code>orb</code>, или содержащие их архивы.</p>
+<p>Теперь откройте <code>библиотеку</code> (нажмите на <image l:href="#books.png" voffset="-6"/>), выберите книгу, и приступайте к чтению.</p>
+<p>Чтобы читать книгу в другом формате, ее нужно вручную добавить в библиотеку. Запустите <code>диалог добавления книги</code> (<image l:href="#addbook.png"/>), выберите файл и отредактируйте информацию о книге. В следующий раз вы сможете открыть эту книгу уже с помощью <code>библиотеки</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
-<subtitle><p>������</p></subtitle>
-<p>���������� �� FBReader'� � ������ ������ ��������� ����� ����� �� <a l:href="http://www.fbreader.org">����� FBReader'�</a>.</p>
-<p>���� �� ������ �������� ��������� � ����� �������, ����������� �� <a l:href="http://freshmeat.net/projects/fbreader">������ FBReader �� freshmeat</a>.</p>
-<p>����� ��������� � �������� ���������, �������������� <a l:href="http://groups.google.com/group/fbreader">������� FBReader �� googlegroups</a>.</p>
+<subtitle><p>Ссылки</p></subtitle>
+<p>Информацию об FBReader'е и свежую версию программы можно найти на <a l:href="http://www.fbreader.org">сайте FBReader'а</a>.</p>
+<p>Если вы хотите получать сообщения о новых версиях, подпишитесь на <a l:href="http://freshmeat.net/projects/fbreader">проект FBReader на freshmeat</a>.</p>
+<p>Чтобы связаться с авторами программы, воспользуйтесь <a l:href="http://groups.google.com/group/fbreader">группой FBReader на googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.sv.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.sv.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.sv.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.sv.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -16,120 +16,180 @@
 <p>Om du har några frågor eller förslag kan du använda <a l:href="http://groups.google.com/group/fbreader">FBReaders grupp hos Google Groups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.uk.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.uk.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.desktop.uk.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.desktop.uk.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -16,120 +16,180 @@
 <p>Для зв'язку з авторами програми скористуйтесь <a l:href="http://groups.google.com/group/fbreader">групою FBReader на googlegroups</a>.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.cs.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.cs.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.cs.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.cs.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>cs</lang></title-info></description>
+<body>
+<title><p>O programu FBReader &FBReaderVersion;</p></title>
+<p>FBReader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. FBReader podporuje následující formáty elektronických knih: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, atd. Přímé čtení archivů <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> je též podporováno.</p>
+<p>FBReader je šířen pod licencí <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Máte-li zájem o tento program a chcete-li podpořit jeho vývoj, navštivte prosím <a l:href="http://www.fbreader.org/donation/make.php">stránku příspěvků</a>.</p>
+<empty-line/>
+<subtitle><p>Jak začít</p></subtitle>
+<p>FBReader hledá knihy ve formátech <code>fb2</code>, <code>oeb</code> a <code>OpenReader</code> v cestě zadaných v parametru <code>Složka s knihami</code>. Nejprve nastavte tento parametr. Otevřete dialog s nastavením a změňte hodnotu parametru <code>Složka s knihami</code> v záložce <code>Knihovna</code>. Uvedený parametr obsahuje seznam adresářů se soubory <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.</p>
+<p>Otevřete <code>knihovnu</code> (kliknutím na <image l:href="#books.png" voffset="-6"/>), vyberte knihu, kterou chcete číst ze seznamu.</p>
+<p>Pro čtení souboru v jiném formátu je nezbytné jeho zařazení do knihovny. Začněte <code>na vložení knihy do knihovny</code> (<image l:href="#addbook.png"/>), vyberte soubor a editujte informace o něm. Další otevření souboru uskutečněte pomocí <code>knihovny</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Odkazy</p></subtitle>
+<p>Více informací o programu najdete na <a l:href="http://www.fbreader.org">Domovské stránce programu FBReader</a>.</p>
+<p>Pro upozornění na nové verze se prosím přihlaste <a l:href="http://freshmeat.net/projects/fbreader">FBReader projekt na freshmeatu</a>.</p>
+<p>Pro vaše otázky a návrhy použijte prosím <a l:href="http://groups.google.com/group/fbreader">skupinu věnovanou programu FBReader na googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.en.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.en.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.en.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.en.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>en</lang></title-info></description>
+<body>
+<title><p>About FBReader &FBReaderVersion;</p></title>
+<p>FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
+<p>FBReader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>If you like the program and would like to support its development, please visit <a l:href="http://www.fbreader.org/donation/make.php">make donation</a> page.</p>
+<empty-line/>
+<subtitle><p>How To Start</p></subtitle>
+<p>FBReader looks for <code>fb2</code>, <code>oeb</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> or archive files. Directories in the list are separated by colons.</p>
+<p>Open <code>library</code> (click on <image l:href="#books.png" voffset="-6"/>), select a book from the list and read it.</p>
+<p>To read a file in another format, you need to add it to the library. Start <code>add to library dialog</code> (<image l:href="#addbook.png"/>), select a file and edit the file information. Next time you can open this file using <code>library</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Related sites</p></subtitle>
+<p>More information about this program can be found at <a l:href="http://www.fbreader.org">FBReader homepage</a>.</p>
+<p>If you want to be notified about new releases, please subscribe to <a l:href="http://freshmeat.net/projects/fbreader">FBReader project at freshmeat</a>.</p>
+<p>If you have any questions or suggestions, please use <a l:href="http://groups.google.com/group/fbreader">FBReader group at googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.fi.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.fi.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.fi.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.fi.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Tietoja FBReaderista</book-title> <lang>fi</lang></title-info></description>
+<body>
+<title><p>Tietoja FBReaderista &FBReaderVersion;</p></title>
+<p>FBReader on sähköisten kirjojen (e-kirja) lukemiseen tarkoitettu ohjelmisto Linux, Windows XP, PDA ja UMPC -tietokoneille. FBReader tukee mm. seuraavia e-kirjojen tiedostomuotoja: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>. Kirjojen lukeminen onnistuu suoraan myös <code>zip</code>, <code>tar</code>, <code>gzip</code> ja <code>bzip2</code>-muotoihin pakatuista tiedostoista.</p>
+<p>FBReader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla.</p>
+<empty-line/>
+<subtitle><p>Aloitusohje</p></subtitle>
+<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
+<p>Avaa <code>kirjasto</code> (työkalupalkin <image l:href="#books.png" voffset="-6"/>-kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.</p>
+<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
+<empty-line/>
+<subtitle><p>Liittyvät sivustot</p></subtitle>
+<p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">FBReaderin kotisivulta</a>.</p>
+<p>Jos haluat tiedon uusien versioiden julkaisuista, tilaa <a l:href="http://freshmeat.net/projects/fbreader">FBReader-projekti freshmeat palvelussa</a>.</p>
+<p>Jos sinulla on kysymyksiä tai ehdotuksia, käytä <a l:href="http://groups.google.com/group/fbreader">FBReader-ryhmää googlegroups palvelussa</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.fr.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.fr.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.fr.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.fr.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>À propos de FBReader</book-title> <lang>fr</lang></title-info></description>
+<body>
+<title><p>À propos de FBReader &FBReaderVersion;</p></title>
+<p>FBReader est un lecteur de livres électroniques (e-books) pour PDA, ordinateur de bureau et UMPC sous Linux ou Windows XP. FBReader supporte plusieurs formats de livres électroniques : <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. La lecture directe à partir d'archives <code>zip</code>, <code>tar</code>, <code>gzip</code> et <code>bzip2</code> est également supportée.</p>
+<p>FBReader est distribué selon les termes de la licence <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<empty-line/>
+<subtitle><p>Débuts avec FBReader</p></subtitle>
+<p>FBReader cherche des livres aux formats <code>fb2</code>, <code>oeb</code> et <code>OpenReader</code> dans les répertoires indiqués dans l'option <code>Chemin des livres</code>. La première chose à faire est de remplir ce chemin. Ouvrez la boîte de dialogue d'options et changez la valeur de l'option <code>Chemin des livres</code> dans l'onglet <code>Bibliothèque</code>. Cette option contient la liste des répertoires contenant des fichiers <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> ou des fichiers archives. Les répertoires de cette liste sont séparés par des caractères deux-points.</p>
+<p>Ouvrez la <code>bibliothèque</code> (cliques sur <image l:href="#books.png" voffset="-6"/>) et sélectionnez un livre de la liste afin de le lire.</p>
+<p>Pour lire un fichier dans un autre format, vous devez l'ajouter à la bibliothèque. Ouvrez le dialogue <code>Ajouter un livre</code> (<image l:href="#addbook.png"/>), sélectionnez un fichier et éditez les informations correspondantes. Dans l'avenir, vous pourrez ouvrir ce livre directement depuis la <code>bibliothèque</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Informations complémentaires</p></subtitle>
+<p>Davantage d'informations sur ce programme se trouvent sur la <a l:href="http://www.fbreader.org">page Web de FBReader</a>.</p>
+<p>Si vous souhaitez être prévenu des nouvelles versions, veuillez vous inscrire au <a l:href="http://freshmeat.net/projects/fbreader">projet FBReader de freshmeat</a>.</p>
+<p>Si vous avez des questions ou des suggestions, veuillez utiliser le <a l:href="http://groups.google.com/group/fbreader">groupe FBReader de googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFiIVNd73
+uAAACXNJREFUWMO1l2mMndV5x3/nPe9617l37szYM+OVMXbGGHATO6ZesA04
+JjQqNBtKgWwKigNlcZUUukREDUIKJU1oVUSkqIkVURwsI4PsELCJwQFDvWMb
+jBnPeGYym5eZuXOX977bOf3QUiEZV5i2z5dzpOf/6Pw+PHrO/xFcQuzsf+H1
+3f42e/jM2e7yVOC1F+awsHmRv2b2qj+d785/iY8R4qMKh2u9LZt6fnVm0+hj
+JNqkUJhBTk5n4LVBVk1bFn5j5W23Lmtf/eylAhgfVVixJrr2T75BNQUqaxOL
+iM5ZreRnOmw59G/23/3mwWeeGP7R7f9vAHU5NafP78PzpiGTLNK3KEqPfMaE
+tpjDyWH593se2fTEKz/dcCkA5kcVvn56/xzHFgSNEGkLIGKiNsXSq1dwdN9J
+lBFCOuLRsUf+5Z97Hi+ubL3ulcHg1Iod1WfmrOSGvuuyNz7RWmop/48A23uf
+W/HbY9sXlUqlw9//44f3fjB3Ohy6pmpHGK7Gsi1Qmpqq4BZnM7t7Fsf6DxNW
+oRhY7Ozf8cNTzjscyb7OdaWbeGPwFcaHxm8frg6tbs90nP3QJnxt8tVr/vHA
+w7sPnH3bTlREWqRo1dOH5pUWjBpZ6b3VONQ9lh3BkwJhakxh0uK0cuXsxYwN
+j3DovQM0nDptC1qZZnbQn36P9spM8m6Otan1nJw8wblna/9+9/X3r148c7H/
+/rvy/UvLuvw9z1V/varuxERpH9+tMWVM5qaMyfaRZLjlrDGG2WxgSUEiI6Rr
+oEVCpTaFcAVWUZLtTFMrljnnjtI20YllmzRMnxE1xGJvGft79ncMnjvd/ebT
++zdf0ISRDpNYRGS0R0Z4ZFwXO6OomGeom2exUzGmjhAaHMdB2wrtKSaCcSaC
+c+i0xvCg0CjRHs6g4BYpZ8eZtCeYzkw+Zaxg7vQutv3h6Vv+6rV777wAYGX3
+6p9Pq3eGZsNETwlETSC1gWFoLFdgW5KkGmApB9v0ULEGCdliFukaCFOjpMI0
+TWZMdDEkTyNDiyv0Er5ib2Bf401e6n2RKWeSPW/t/toFALdM/1LPZ0t/9uPQ
+Usi0jeOlsR0PLQWNKEQaDvlUCUd50FDY0gItkFIixH+dWoCpGMj00BJPJ21n
++KL8Kk9sf5x/+Nmj9GX7aJYtfGrup3/xoZPwrfKRzLqD6/qJkyKxIuWaSFuC
+AZZlY0kbNRFTpkxbVwnLMZGxRGKQbU1T11VkzcRoUph4zE+uov9cP3u3HkRr
+TZjzuYqFm3fd/satFx3FXz/85RcP9Ry6wU818GUN05Y0Z5tRkxEnDvYgT3no
+aTEVFdH+ifwLS25Y7JZT46sTmZAVeXy7gq/r5MIC1lCK/VsOkbGyVGUZUVJD
+v12xb+FVs64oX3QS9lV68xU5RWD4mJ5FNp1jfHCCngN9NIZAKEGlHpGaFM9/
+t/TQnRu8BzZ0BrN+j4yRiaBarjNbdJFrFCjXJ6m2VRiUw8jI4pt/tOG+Dz5+
+AcCBscOLBmt9S3U+IbYjGmEdERsE5wPC0YQWmcMpGngmLClds+X+dfcPrs+s
+P9HFgq1u7BIZDTrznVQnaxRSzSy6fBH5VAYjgoLTRG3MH7/oX/Do0Ue6v7/j
+wd/U/DqKBGkKhBAEQUClUiMIQMeas7qKFzgsvWzpy+/Xzst3vdwUNdFwKlRU
+lTDn8we/n4Jd5Luf+1tuvuxmRvvPsqf/d5tePLnt2gsAPr/jxh/908EfH99n
+/74jK3PEUxrVAMdywNBYKYN8m4VKKbABQyHlf88wkki9o9R/NpQvKsRGjMwJ
+huvDSBe+dfO3uGvD3YwOjHY8+PRDuzZuv++He8qvSgB5x5YvfeXV8y8/5rfW
+SYox2WoGhMZ0LEIVYQhBc66Z6aVpBI2ArGdRs+sUdMuRd3a8ewRgyX2Lr3jH
+OvJtqSwSCyzl4OAwGY3TG77LGXuY+YUF3LrqNp4f3G4c7Du46kTPiaX3bLxn
+q5EpZD9peS4oA1WRVBoVMAWGZaB1Agl4TorpLR3M6ZxDLluEvOBY460vbN77
+zAyAIWtgbWCFqEBiBQ7ChyiKSFIBQabG8dphdk/t5PWp3dxy22dw5mn29O5c
+v/vYznvNjJdLXOVRn4pocrPIpgahCEgCH8uxsYRFWA1pnd3GmvVreP7AdsLz
+IcOj/Z/73tt3NW48eu3vTsYnvqi0AEvjxinqokJsh8jYICcKRCJmPDdML2/T
+FrQSOJM0zUyRbU0hH/ibBwdS5OckAZUoikZSDTcXJrGt0prE0YSRwrQdGkaI
+KgraO9pwcg5WkyQ/L71QFcObIoIZtmkRqxihYlKGgFgRS5c4NPASG60VdVMT
+mYqju4fonOjkG1d/+4EP9YT3Hrxz6fb3nttWz1enua5L2sxCoPA8D09mUWZE
+YARYWYmyEkIdkE6nMU2TQAtM0SBxEpTnoquKVulRiyYIcgp1PM3I3jOszK19
++Zdffuq6i5rS5b+68oHR/NAjsRuTdly01pgWEKewUybKBtMFLAMhNK7tIYRB
+wc5Rq56hInwC00ZNGSzrvPqlyclyX9VOmH2iM5xbnLd3+Yxrn12WX+5f1JIV
+0qWeMXsMP64jhIFjmSjDwEwLYqmIVUgUC1zTRQoTFWmkEAzGISePn6JyPoIG
+XB7M2fvk3ZvXXbInPBdPtpRVDdO2sUWWuBEThBGm5yMtiekIhBaoWBEmIUJK
+crk0ncPNjPVILCNCiDzGZKbvY7nikejM1XUdIHCgITGVi2enkZGJTAxEbKIi
+iANFEoJKNI7t0VLoRqkcwktBVlLV5/MfC0Da8TWuKdHVkKgSIqKEeq1MUtXQ
+sDBCSVxNSBoKoQVJmOD7AfOdEs3KxEpCIrNKVExaLhngod3fywgVdsskwYw1
+OctFEjEwOMHI6dEBf6LeJxITlETHmjhW+L5PpVKmng1opENqZkxkJLSVWocu
+GaDUMiNfkO2yUouoFMuM6CGCfuGv4/o7an+RzOr7/Ojcxy/7+XfmxZdzPhom
+cCZQ0qcancfNVFGWoins4Kb0HQMPL3/yLz/Wbrip9xcbtx3Z8oMz5ZHM3OL8
+d9d2rfvzr3Z/7cAHNT849tc/2Tr61L1TqSlcK40KFNfOvp53dx1nbeeap/5k
+4We/88lpa8r8b2L/8JszL5Y7VNtv37fvrl1dWzv0ghfm6lW7VuiNRzf2/uvx
+J9f/n2/HF13ZB17K//rUU4/JlLnoypYlm5fnrvrZlaVPVz9q/X8A8yhCVXd4
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwUYkGhT
+VwAACFpJREFUWMOtl0mMnVeZhp8z/PMd69at0RU7cdmJHRwldhoMLJgUETCI
+VjdNN0IsWIAEEkJCAsECBGKBRLOjV91qNYEgEIhByIJuIYQUhZBBmIDJ4MR2
+OXZVuQbXcO9/7/3Hcw6LRqyCKMDf+nyvHr36zvudIzhg/T69KAeNQStJk9SK
+6uG0GC1vDG+du7a++tCVyyvMT8//8PSpB758V2fuxdl4IZ/xZquD6IqDAnzi
+qU+8+yn12w+v1NffoazUU1GHkwvHOdJY4OmfPsnVi5cxmeN0dCb/6Hs/fvc7
+T73j+kF09YEdMM/9+En7GESWJIppxxoRl4SBwJqCShjK0HFp7+XQBrZxUF15
+0IPGVBBaVArxQNDci5gZz3JMnmDaLOKbDrVNqOOaXOTmtgMkpkGiu5gF2I4K
+brqMAocnfChLRJ0T+RbjWXJT3n6AurND4GrEEKhrcrXFnthB08ZzfZSLUdrh
+lT4zVbs+qO6BZ8CXEW6ocbHADxWTfMLm7gb5TE6326WXzDDxRsTLmuvt9frr
+N34QD9Jhcbw9S7+1RDuYdsf8OXsggH//1ddcJXbYU1vE4hBCOH40eoTS1JA7
+rG8xypLqlJqK1507y4NvexACy0r6G9aClZVBuapmkkV25Ygv/c8nmY1muPDi
+L06fvuctz/5FgP+69B+M/A2qZEKUHCIsfNZaL5GHGl/4lEVJrUte3H+eb6z9
+N71ihsXeIcgdvSnBOqu6jhKO1wsc8ae4tHqRVd1i895z0YEcWBEvUwUWAhDR
+dQKjqT1ASlzhECGICDI/50L2NJFJWLKHUEKxMO5TJZamhDLdpdM7wXR7jkpH
+bFaVOxCAlh5WFjACIwzCBoSFpDKaWhd4yqM0FQjYD1L2q5SN0QaNRsy1okdu
+BEveHZyI72BCxTBVFGGE7XXkgQCcM0RO4FUBe7VFaw9TTDBU+E0PIQR1ZbDS
+ggUUOAvjesJYTLBlRFUqVjsbrLNNJ1mkIIKiOtgQmrjGCgikBjGmUA4jQTUN
+NY5qUuNHAdrXZPkEFSqEL7GlBVnjhYbaZOyKHVaHN4hFTNu2aL9KPLwqwIn0
+FDfNKqPuPr1Ri67sc7l7GSMs0dhiOh5l6GCY8Yb4QY5693PTbHJVvkDQrlit
+hmgk49pyRdXshBkLdZ+Rtyj+5mV03xNn3O/qizRCyYgKQsnhYJb3HXsv8U6f
+377yHOtqhSBXhNMN0nFGkk9xZ3jmSvWK97M3z7/u1w/fc/aR+VZY/U1BJIyG
+oKJCgdIgPALn03AJN369zqVfXWXi7RLKO/j8+z7wrx+4/4Pf/f/OHwLwyN+b
+hM08I7aOiVeD7xASBukuWztbbNwcItKYVqOBsdPMVkd/cNujWIYhToKnocLg
+hGGiarbYZhAIZKeLcQKnayxG3vZldEumZAnoGpgAFdjQsFFtsSNT8khRighf
+G8bU0W13oJn5ZUvja9UAT5ExxljD5s4WZTVLpCN8r02rgJ9fXXv0i088U4U2
+2u62Y6a74cWuUuWC374URMHIVNX1o21/+0+34Oq1FVkURVDXtbtyU+oX/A2X
+pv3wxZu3VLFTBM1m2v3O6NPn6a0sEQG9CMICEVmW7GHUS4fRK4cotyUuG9O7
+5yxHDv0DnZFHIismwQR0zbSfQDnBVzDfbn/v6MLcR8Q/feWRzwyj7mKhdGcy
+GfWSIpiSykxVpu4JnXQslZTJOhde+k8y8SxCgpdFqMRjEg+hhuTWEmZtCmxI
+JWLuO/12mr0TVDpBBgItSgKhEKWgU62zNYLcauZU/oy+q99++OXd0ZtaQYhO
+FNuNEqksGIMShrq2WGUQQoCRWGkpPYerC8j/aGIZIEwTQQNPVPhYQuXAFti8
+AmnQ2kdZQX/pLg5PL1GVMLn+wnH91Q/945u/8Oj581NTnXPtRkBsHE7DyDjS
+WrOWptzM9rgetdkcN8kZoEKPujYgJRQx2b5B5R5+Mo3WA6rKkGcpRSWRytHt
+tjh6+BDzvT5b44yd4YRrl68QDzYiDXBnolnsBrRDxWzpkJFH7YWUcZeJ0qTB
+Ud50qkVqXuHx8gmqQc211TU2x7fItwpMV+B3A8rApydOMiw11WBCrz/Pwtwc
+zdgnG2U8v/k8q2nBYD9luLXBfTMNXwD832NPnT+8MHOuGylsSyGlxDmBFjFK
+hiShJqs2QaZQLeFMzdjmTDBkgzGTtYzfX8k5/8wVbswLxuMxWvo0ojYaQZWN
+cOWIQDu294b02i1mW5E9Ndf5rAYYW499owlUDOMcTwqEA0GBcCUm8/CtQriI
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.id.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.id.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.id.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.id.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Mengenai FBReader</book-title> <lang>id</lang></title-info></description>
+<body>
+<title><p>Mengenai FBReader &FBReaderVersion;</p></title>
+<p>FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
+<p>FBReader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman <a l:href="http://www.fbreader.org/donation/make.php">pemberian donasi</a>.</p>
+<empty-line/>
+<subtitle><p>Bagaimana Memulainya</p></subtitle>
+<p>FBReader mencari buku format <code>fb2</code>, <code>oeb</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik dua.</p>
+<p>Buka <code>pustaka</code> (klik pada ikon <image l:href="#books.png" voffset="-6"/>), pilih sebuah buku dari daftar dan Anda bisa mulai membaca.</p>
+<p>Untuk membaca berkas dalam format lain, Anda perlu menambahkannya ke pustaka. Mulailah <code>dialog tambah ke pustaka</code> (<image l:href="#addbook.png"/>), pilih sebuah berkas dan ubah informasi berkasnya jika perlu. Di lain waktu Anda dapat membuka berkas ini menggunakan <code>pustaka</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Alamat yang berkaitan</p></subtitle>
+<p>Informasi tambahan mengenai aplikasi ini dapat ditemukan di <a l:href="http://www.fbreader.org">situs FBReader</a>.</p>
+<p>Jika ingin menerima informasi mengenai rilis baru aplikasi ini, silakan daftarkan diri ke <a l:href="http://freshmeat.net/projects/fbreader">proyek FBReader di freshmeat</a>.</p>
+<p>Jika Anda memiliki pertanyaan atau masukan, silakan gunakan <a l:href="http://groups.google.com/group/fbreader">grup FBReader di googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.it.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.it.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.it.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.it.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Informazioni su FBReader</book-title> <lang>it</lang></title-info></description>
+<body>
+<title><p>Informazioni su FBReader &FBReaderVersion;</p></title>
+<p>FBReader è un lettore di e-book per PDA/UMPC/computer Linux/Windows. FBReader supporta diversi formati di e-book: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. E' anche supportata la lettura diretta da archivi <code>zip</code>, <code>tar</code>, <code>gzip</code> e <code>bzip2</code>.</p>
+<p>FBReader è distribuito nei termini is della licenza <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<empty-line/>
+<subtitle><p>Come Iniziare</p></subtitle>
+<p>FBReader cerca i libri <code>fb2</code>, <code>oeb</code> e <code>OpenReader</code> nelle cartelle elencate nell'opzione <code>Percorso Libri</code>. Prima di tutto occorre impostare questo percorso. Apri la finestra Opzioni and cambiare il valore dell'opzione <code>Percorso Libri</code> nella scheda <code>Biblioteca</code>. Questa opzione contiene l'elenco delle cartelle contenenti file <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> o archivi. Le cartelle dell'elenco sono separate da due punti.</p>
+<p>Apri <code>biblioteca</code> (fare clic su <image l:href="#books.png" voffset="-6"/>), seleziona un libro dall'elenco e leggi.</p>
+<p>Per leggere un file in un altro formato, devi aggiungerlo alla biblioteca. Apri la <code>finestra aggiungi alla biblioteca</code> (<image l:href="#addbook.png"/>), seleziona un file e modifica le informazioni sul file. La prossima volta puoi aprire questo file usando la <code>biblioteca</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Siti correlati</p></subtitle>
+<p>Ulteriori informazioni su questo programma possono essere trovate alla <a l:href="http://www.fbreader.org">homepage di FBReader</a>.</p>
+<p>Se vuoi essere informato sull'uscita di nuove versioni, per favore iscriviti al <a l:href="http://freshmeat.net/projects/fbreader">progetto FBReader su freshmeat</a>.</p>
+<p>Se hai domande o suggerimenti, per favore usa il <a l:href="http://groups.google.com/group/fbreader">gruppo di FBReader su google gruppi</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwUYkGhT
+VwAACFpJREFUWMOtl0mMnVeZhp8z/PMd69at0RU7cdmJHRwldhoMLJgUETCI
+VjdNN0IsWIAEEkJCAsECBGKBRLOjV91qNYEgEIhByIJuIYQUhZBBmIDJ4MR2
+OXZVuQbXcO9/7/3Hcw6LRqyCKMDf+nyvHr36zvudIzhg/T69KAeNQStJk9SK
+6uG0GC1vDG+du7a++tCVyyvMT8//8PSpB758V2fuxdl4IZ/xZquD6IqDAnzi
+qU+8+yn12w+v1NffoazUU1GHkwvHOdJY4OmfPsnVi5cxmeN0dCb/6Hs/fvc7
+T73j+kF09YEdMM/9+En7GESWJIppxxoRl4SBwJqCShjK0HFp7+XQBrZxUF15
+0IPGVBBaVArxQNDci5gZz3JMnmDaLOKbDrVNqOOaXOTmtgMkpkGiu5gF2I4K
+brqMAocnfChLRJ0T+RbjWXJT3n6AurND4GrEEKhrcrXFnthB08ZzfZSLUdrh
+lT4zVbs+qO6BZ8CXEW6ocbHADxWTfMLm7gb5TE6326WXzDDxRsTLmuvt9frr
+N34QD9Jhcbw9S7+1RDuYdsf8OXsggH//1ddcJXbYU1vE4hBCOH40eoTS1JA7
+rG8xypLqlJqK1507y4NvexACy0r6G9aClZVBuapmkkV25Ygv/c8nmY1muPDi
+L06fvuctz/5FgP+69B+M/A2qZEKUHCIsfNZaL5GHGl/4lEVJrUte3H+eb6z9
+N71ihsXeIcgdvSnBOqu6jhKO1wsc8ae4tHqRVd1i895z0YEcWBEvUwUWAhDR
+dQKjqT1ASlzhECGICDI/50L2NJFJWLKHUEKxMO5TJZamhDLdpdM7wXR7jkpH
+bFaVOxCAlh5WFjACIwzCBoSFpDKaWhd4yqM0FQjYD1L2q5SN0QaNRsy1okdu
+BEveHZyI72BCxTBVFGGE7XXkgQCcM0RO4FUBe7VFaw9TTDBU+E0PIQR1ZbDS
+ggUUOAvjesJYTLBlRFUqVjsbrLNNJ1mkIIKiOtgQmrjGCgikBjGmUA4jQTUN
+NY5qUuNHAdrXZPkEFSqEL7GlBVnjhYbaZOyKHVaHN4hFTNu2aL9KPLwqwIn0
+FDfNKqPuPr1Ri67sc7l7GSMs0dhiOh5l6GCY8Yb4QY5693PTbHJVvkDQrlit
+hmgk49pyRdXshBkLdZ+Rtyj+5mV03xNn3O/qizRCyYgKQsnhYJb3HXsv8U6f
+377yHOtqhSBXhNMN0nFGkk9xZ3jmSvWK97M3z7/u1w/fc/aR+VZY/U1BJIyG
+oKJCgdIgPALn03AJN369zqVfXWXi7RLKO/j8+z7wrx+4/4Pf/f/OHwLwyN+b
+hM08I7aOiVeD7xASBukuWztbbNwcItKYVqOBsdPMVkd/cNujWIYhToKnocLg
+hGGiarbYZhAIZKeLcQKnayxG3vZldEumZAnoGpgAFdjQsFFtsSNT8khRighf
+G8bU0W13oJn5ZUvja9UAT5ExxljD5s4WZTVLpCN8r02rgJ9fXXv0i088U4U2
+2u62Y6a74cWuUuWC374URMHIVNX1o21/+0+34Oq1FVkURVDXtbtyU+oX/A2X
+pv3wxZu3VLFTBM1m2v3O6NPn6a0sEQG9CMICEVmW7GHUS4fRK4cotyUuG9O7
+5yxHDv0DnZFHIismwQR0zbSfQDnBVzDfbn/v6MLcR8Q/feWRzwyj7mKhdGcy
+GfWSIpiSykxVpu4JnXQslZTJOhde+k8y8SxCgpdFqMRjEg+hhuTWEmZtCmxI
+JWLuO/12mr0TVDpBBgItSgKhEKWgU62zNYLcauZU/oy+q99++OXd0ZtaQYhO
+FNuNEqksGIMShrq2WGUQQoCRWGkpPYerC8j/aGIZIEwTQQNPVPhYQuXAFti8
+AmnQ2kdZQX/pLg5PL1GVMLn+wnH91Q/945u/8Oj581NTnXPtRkBsHE7DyDjS
+WrOWptzM9rgetdkcN8kZoEKPujYgJRQx2b5B5R5+Mo3WA6rKkGcpRSWRytHt
+tjh6+BDzvT5b44yd4YRrl68QDzYiDXBnolnsBrRDxWzpkJFH7YWUcZeJ0qTB
+Ud50qkVqXuHx8gmqQc211TU2x7fItwpMV+B3A8rApydOMiw11WBCrz/Pwtwc
+zdgnG2U8v/k8q2nBYD9luLXBfTMNXwD832NPnT+8MHOuGylsSyGlxDmBFjFK
+hiShJqs2QaZQLeFMzdjmTDBkgzGTtYzfX8k5/8wVbswLxuMxWvo0ojYaQZWN
+cOWIQDu294b02i1mW5E9Ndf5rAYYW499owlUDOMcTwqEA0GBcCUm8/CtQriI
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.ru.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.ru.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.ru.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.ru.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>О программе FBReader</book-title> <lang>ru</lang></title-info></description>
+<body>
+<title><p>О программе FBReader &FBReaderVersion;</p></title>
+<p>FBReader &#8211; программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. FBReader позволяет читать книги во многих форматах: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и&#160;т.&#160;д. Файлы можно читать напрямую из архивов <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
+<p>FBReader распространяется свободно, включая исходные тексты, под лицензией <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<empty-line/>
+<subtitle><p>С чего начать</p></subtitle>
+<p>FBReader автоматически собирает в библиотеку файлы форматов <code>fb2</code>, <code>oeb</code> и <code>OpenReader</code>, лежащие в каталогах, заданных параметром <code>&#171;Каталоги с книгами&#187;</code>. Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек и отредактруйте <code>&#171;каталоги с книгами&#187;</code> в разделе <code>&#171;Библиотека&#187;</code>. Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями <code>fb2</code>, <code>oebzip</code> или <code>orb</code>, или содержащие их архивы.</p>
+<p>Теперь откройте <code>библиотеку</code> (нажмите на <image l:href="#books.png" voffset="-6"/>), выберите книгу, и приступайте к чтению.</p>
+<p>Чтобы читать книгу в другом формате, ее нужно вручную добавить в библиотеку. Запустите <code>диалог добавления книги</code> (<image l:href="#addbook.png"/>), выберите файл и отредактируйте информацию о книге. В следующий раз вы сможете открыть эту книгу уже с помощью <code>библиотеки</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Ссылки</p></subtitle>
+<p>Информацию об FBReader'е и свежую версию программы можно найти на <a l:href="http://www.fbreader.org">сайте FBReader'а</a>.</p>
+<p>Если вы хотите получать сообщения о новых версиях, подпишитесь на <a l:href="http://freshmeat.net/projects/fbreader">проект FBReader на freshmeat</a>.</p>
+<p>Чтобы связаться с авторами программы, воспользуйтесь <a l:href="http://groups.google.com/group/fbreader">группой FBReader на googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.sv.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.sv.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.sv.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.sv.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Om FBReader</book-title> <lang>sv</lang></title-info></description>
+<body>
+<title><p>Om FBReader &FBReaderVersion;</p></title>
+<p>FBReader är en e-boksläsare för Linux/Windows XP PDA/UMPC/skrivbordsdator. FBReader har stöd för flera e-boksformat: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direktläsning från arkivformaten <code>zip</code>, <code>tar</code>, <code>gzip</code> och <code>bzip2</code> stöds också.</p>
+<p>FBReader distribueras under villkoren för <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<empty-line/>
+<subtitle><p>Hur man kommer igång</p></subtitle>
+<p>FBReader letar efter böcker i formaten <code>fb2</code>, <code>oeb</code> och <code>OpenReader</code> i kataloger som listas i alternativet <code>Boksökväg</code>. Först måste du ange denna sökväg. Öppna alternativdialogrutan och ändra värdet för alternativet <code>Boksökväg</code> under fliken <code>Bibliotek</code>. Detta alternativ innehåller listan över kataloger som innehåller <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> eller arkivfiler. Kataloger i listan separeras med kolon.</p>
+<p>Öppna <code>biblioteket</code> (klicka på <image l:href="#books.png" voffset="-6"/>), välj en bok från listan och läs den.</p>
+<p>För att läsa en fil i ett annat format måste du lägga till den till biblioteket. Starta <code>Lägg till i biblioteket</code> (<image l:href="#addbook.png"/>), välj en fil och redigera filinformationen. Nästa gång så kan du öppna denna fil med <code>biblioteket</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Relaterade webbplatser</p></subtitle>
+<p>Mer information om det här programmet kan hittas på <a l:href="http://www.fbreader.org">FBReaders webbplats</a>.</p>
+<p>Om du vill bli informerad om nya utgåvor kan du prenumerera på <a l:href="http://freshmeat.net/projects/fbreader">FBReaders projektsida på Freshmeat</a>.</p>
+<p>Om du har några frågor eller förslag kan du använda <a l:href="http://groups.google.com/group/fbreader">FBReaders grupp hos Google Groups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.uk.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.uk.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.maemo.uk.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.maemo.uk.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>Про програму FBReader</book-title> <lang>uk</lang></title-info></description>
+<body>
+<title><p>Про програму FBReader &FBReaderVersion;</p></title>
+<p>FBReader &#8211; програма для читання електронних книг, яка працює під операційними системами Linux, FreeBSD, Windows XP. FBReader дозволяє читати книги у багатьох форматах: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, і&#160;т.&#160;д. Файли можна читати напряму з архівів <code>zip</code>, <code>tar</code>, <code>gzip</code> та <code>bzip2</code>.</p>
+<p>FBReader поширюється вільно, разом з джерельними текстами, під лицензією <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<empty-line/>
+<subtitle><p>З чого почати</p></subtitle>
+<p>FBReader автоматично збирає у бібліотеку файли форматів <code>fb2</code>, <code>oeb</code> та <code>OpenReader</code>, що лежать у каталогах, які задані параметром <code>&#8220;Каталоги з книгами&#8221;</code>. Тому передусім треба визначити цей параметр. Відкрийте діалог налаштувань і відредагуйте <code>&#8220;каталоги з книгами&#8221;</code> у розділі <code>&#8220;Бібліотека&#8221;</code>. Каталоги перелічуються через двокрапку i повинні містити файли з розширеннями <code>fb2</code>, <code>oebzip</code> або <code>orb</code>, чи архіви, що їх містять.</p>
+<p>Тепер відкрийте <code>бібліотеку</code> (натисніть на <image l:href="#books.png" voffset="-6"/>), виберіть книгу і починайте читати.</p>
+<p>Щоб читати книгу у іншому форматі, її потрібно вручну додати у бібліотеку. Запустіть <code>діалог додавання книги</code> (<image l:href="#addbook.png"/>), виберіть файл і відредагуйте інформацію про книгу. Наступного разу ви зможете відкрити цю книгу вже за допомогою <code>бібліотеки</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Посилання</p></subtitle>
+<p>Інформацію про FBReader та нову версію програми можна знайти на <a l:href="http://www.fbreader.org">сайтi FBReader'у</a>.</p>
+<p>Якщо ви бажаєте отримувати повідомлення про нові версії, підпишіться на <a l:href="http://freshmeat.net/projects/fbreader">проект FBReader на freshmeat</a>.</p>
+<p>Для зв'язку з авторами програми скористуйтесь <a l:href="http://groups.google.com/group/fbreader">групою FBReader на googlegroups</a>.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.cs.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.cs.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.cs.fb2	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.cs.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>About FBReader</book-title> <lang>cs</lang></title-info></description>
+<body>
+<title><p>O programu FBReader &FBReaderVersion;</p></title>
+<p>FBReader je program pro čtení elektronických knih, který pracuje pod Linuxem/Windows XP PDA/UMPC/PC. FBReader podporuje následující formáty elektronických knih: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, atd. Přímé čtení archivů <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> je též podporováno.</p>
+<p>FBReader je šířen pod licencí <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>.</p>
+<p>Máte-li zájem o tento program a chcete-li podpořit jeho vývoj, navštivte prosím <a l:href="http://www.fbreader.org/donation/make.php">stránku příspěvků</a>.</p>
+<empty-line/>
+<subtitle><p>Jak začít</p></subtitle>
+<p>FBReader hledá knihy ve formátech <code>fb2</code>, <code>oeb</code> a <code>OpenReader</code> v cestě zadané v parametru <code>Složka s knihami</code>. Nejprve nastavte tento parametr. Otevřete dialog s nastavením (kliknutím na položku <image l:href="#settings.png" voffset="-6"/> v panelu nástrojů) a změňte hodnotu parametru <code>Složka s knihami</code> v záložce <code>Knihovna</code>. Uvedený parametr obsahuje seznam adresářů se soubory <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> nebo soubory archivů. Adresáře jsou v seznamu zařazeny do oddělených sloupců.</p>
+<p>Otevřete <code>knihovnu</code> (kliknutím na <image l:href="#books.png" voffset="-6"/>), vyberte knihu, kterou chcete číst ze seznamu.</p>
+<p>Pro čtení souboru v jiném formátu je nezbytné jeho zařazení do knihovny. Začněte <code>na vložení knihy do knihovny</code> (<image l:href="#addbook.png"/>), vyberte soubor a editujte informace o něm. Další otevření souboru uskutečněte pomocí <code>knihovny</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<empty-line/>
+<subtitle><p>Odkazy</p></subtitle>
+<p>Více informací o programu najdete na <a l:href="http://www.fbreader.org">Domovské stránce programu FBReader</a>.</p>
+<p>Pro upozornění na nové verze se prosím přihlaste <a l:href="http://freshmeat.net/projects/fbreader">FBReader projekt na freshmeatu</a>.</p>
+<p>Pro vaše otázky a návrhy použijte prosím <a l:href="http://groups.google.com/group/fbreader">skupinu věnovanou programu FBReader na googlegroups</a>.</p>
+<empty-line/>
+<subtitle><p>Knihovny třetích stran</p></subtitle>
+<p>Distribuce programu FBReader pro Windows XP obsahuje knihonvny třetích stran. Tyto knihovny nejsou uvolněny pod licencí GPL.</p>
+<p><a l:href="http://expat.sourceforge.net">Expat</a> &#8211; XML parsing library. Copyright &#169; 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper.</p>
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+<p><a l:href="http://libungif.sourceforge.net">Libungif</a> &#8211; library for working with GIF images. Copyright &#169; 1997 Eric S. Raymond &lt;<a l:href="mailto:esr@thyrsus.com">esr@thyrsus.com</a>&gt;.</p>
+<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
+<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
+<p><a l:href="http://www.remotesensing.org/libtiff">Libtiff</a> &#8211; Tag Image File Format (TIFF) library. Copyright &#169; 1988-1997 Sam Leffler. Copyright &#169; 1991-1997 Silicon Graphics, Inc. Portions Copyright &#169; 1985-1987, 1990 Regents of the University of California. Portions Copyright &#169; 1990, 1991 Digital Equipment Corporation. Portions Copyright &#169; 1990 Sun Microsystems, Inc. Portions Copyright &#169; 1990, 1995 Frank D. Cringle. Portions Copyright &#169; 1996 BancTec AB. Portions Copyright &#169; 1996 Mike Johnson. Portions Copyright &#169; 1996 Pixar. Portions Copyright &#169; 1997 Greg Ward Larson. Portions Copyright &#169; 2000 Frank Warmerdam.</p>
+<p>Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that (i) the above copyright notices and this permission notice appear in all copies of the software and related documentation, and (ii) the names of Sam Leffler and Silicon Graphics may not be used in any advertising or publicity relating to the software without the specific, prior written permission of Sam Leffler and Silicon Graphics.</p>
+<p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; The Independent JPEG Group's JPEG library. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
+</body>
+<binary content-type="image/png" id="settings.png">
+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
+BFAAAAAASUVORK5CYII=
+====
+</binary>
+<binary content-type="image/png" id="books.png">
+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
+====
+</binary>
+<binary content-type="image/png" id="addbook.png">
+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
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
+====
+</binary>
+</FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.en.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.en.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.en.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.en.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>About FBReader &FBReaderVersion;</p></title>
 <p>FBReader is an e-book reader for Linux/Windows XP PDA/UMPC/desktop computer. FBReader supports several e-book formats: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, etc. Direct reading from <code>zip</code>, <code>tar</code>, <code>gzip</code> and <code>bzip2</code> archives is also supported.</p>
 <p>FBReader is distributed under the terms of the <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>. FBReader for Windows XP is based in part on the work of the Independent JPEG Group.</p>
+<p>If you like the program and would like to support its development, please visit <a l:href="http://www.fbreader.org/donation/make.php">make donation</a> page.</p>
 <empty-line/>
 <subtitle><p>How To Start</p></subtitle>
 <p>FBReader looks for <code>fb2</code>, <code>oeb</code> and <code>OpenReader</code> books in directories listed in the <code>Book Path</code> option. First of all you need to set this path. Open the options dialog (just click on <image l:href="#settings.png" voffset="-6"/> in the toolbar) and change the value of <code>Book Path</code> option in the <code>Library</code> tab. This option contains the list of directories containing <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> or archive files. Directories in the list are separated by semicolons.</p>
@@ -28,120 +29,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; The Independent JPEG Group's JPEG library. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.fi.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.fi.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.fi.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.fi.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -6,14 +6,15 @@
 <p>FBReader ohjelmistoa levitetään <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>-lisenssin mukaisilla ehdoilla. FBReaderin Windows XP-versio perustuu osittain Independent JPEG Groupin ohjelmistoon</p>
 <empty-line/>
 <subtitle><p>Aloitusohje</p></subtitle>
-<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston polku</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston polku</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
+<p>FBReader etsii <code>fb2</code>, <code>oeb</code> ja <code>OpenReader</code>-muodossa olevia kirjoja asetusten <code>Kirjaston hakemisto</code>-kohdassa olevista kansioista. Avaa asetukset valintaikkuna (työkalupalkin <image l:href="#settings.png" voffset="-6"/>-kuvakkeesta) ja muuta <code>Kirjasto</code>-välilehdellä olevaa <code>Kirjaston hakemisto</code>-asetusta. Tämä asetus sisältää listauksen niistä kansioista, jotka sisältävät <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> tai kyseisiä tiedostomuotoja sisältäviä pakattuja tiedostoja. Määritettäessä useita kansioita, tulee ne erottaa toisistaan puolipilkulla.</p>
 <p>Avaa <code>kirjasto</code> (työkalupalkin <image l:href="#books.png" voffset="-6"/>-kuvakkeesta), valitse kirja listasta ja voit aloittaa sen lukemisen.</p>
-<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muokkaa kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
+<p>Lukeaksesi jossakin muussa tiedostomuodossa olevan kirjan, sinuun täytyy ensin lisätä kyseinen kirja kirjastoosi. Avaa <code>lisää kirja kirjastoon</code>-valintaikkuna (työkalupalkin <image l:href="#addbook.png"/>-kuvakkeesta). Valitse kirjan tiedosto ja muuta kirjan tiedot haluamiksesi. Tämän jälkeen voit avata lisätyn kirjan työkalupalkin <code>kirjasto-kuvakkeen</code> (<image l:href="#books.png" voffset="-6"/>) listauksesta.</p>
 <empty-line/>
 <subtitle><p>Liittyvät sivustot</p></subtitle>
 <p>Tästä ohjelmasta löytyy englanniksi lisätietoja <a l:href="http://www.fbreader.org">FBReaderin kotisivulta</a>.</p>
 <p>Jos haluat tiedon uusien versioiden julkaisuista, tilaa <a l:href="http://freshmeat.net/projects/fbreader">FBReader-projekti freshmeat palvelussa</a>.</p>
 <p>Jos sinulla on kysymyksiä tai ehdotuksia, käytä <a l:href="http://groups.google.com/group/fbreader">FBReader-ryhmää googlegroups palvelussa</a>.</p>
+<empty-line/>
 <subtitle><p>Kolmannen osapuolen kirjastot</p></subtitle>
 <p>FBReaderin Windows XP versio sisältää useita GPL-lisenssin ulkopuolisia kolmannen osapuolen kirjastoja. Kyseisten kirjastojen tiedot ovat kerrottuna alla englanniksi.</p>
 <p><a l:href="http://expat.sourceforge.net">Expat</a> &#8211; XML parsing library. Copyright &#169; 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper.</p>
@@ -27,120 +28,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; The Independent JPEG Group's JPEG library. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.fr.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.fr.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.fr.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.fr.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -28,120 +28,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; bibliothèque JPEG du Independent JPEG Group. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.id.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.id.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.id.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.id.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -4,6 +4,7 @@
 <title><p>Mengenai FBReader &FBReaderVersion;</p></title>
 <p>FBReader adalah aplikasi pembaca buku elektronik (e-book) untuk komputer PDA/UMPC/desktop dengan sistem operasi Linux/Windows XP. FBReader mendukung beberapa format buku elektronik: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, dan lain-lain. Juga mendukung pembacaan langsung dari berkas terkompresi dalam format <code>zip</code>, <code>tar</code>, <code>gzip</code> dan <code>bzip2</code>.</p>
 <p>FBReader didistribusikan di bawah lisensi <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>. FBReader untuk Windows XP sebagian berdasarkan pada hasil kerja Independent JPEG Group.</p>
+<p>Jika Anda menyukai program ini dan ingin mendukung pengembangannya, silakan ke halaman <a l:href="http://www.fbreader.org/donation/make.php">pemberian donasi</a>.</p>
 <empty-line/>
 <subtitle><p>Bagaimana Memulainya</p></subtitle>
 <p>FBReader mencari buku format <code>fb2</code>, <code>oeb</code> dan <code>OpenReader</code> dalam direktori yang tercantum dalam pengaturan <code>Lokasi Buku</code>. Anda perlu mengatur lokasi ini terlebih dahulu. Buka dialog pengaturan (klik pada ikon <image l:href="#settings.png" voffset="-6"/> di toolbar) dan ubah pengaturan <code>Lokasi Buku</code> pada halaman <code>Pustaka</code>. Pengaturan ini berisi daftar direktori yang terdapat berkas <code>*.fb2</code>, <code>*.oebzip</code>, <code>*.orb</code> atau berkas terkompresi. Daftar direktori ini dipisahkan oleh titik koma.</p>
@@ -28,120 +29,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; pustaka milik Independent JPEG Group. Hak cipta &#169; 1991-1998, dimiliki oleh Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.it.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.it.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.it.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.it.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -28,120 +28,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; libreria JPEG dell'Independent JPEG Group. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwUYkGhT
+VwAACFpJREFUWMOtl0mMnVeZhp8z/PMd69at0RU7cdmJHRwldhoMLJgUETCI
+VjdNN0IsWIAEEkJCAsECBGKBRLOjV91qNYEgEIhByIJuIYQUhZBBmIDJ4MR2
+OXZVuQbXcO9/7/3Hcw6LRqyCKMDf+nyvHr36zvudIzhg/T69KAeNQStJk9SK
+6uG0GC1vDG+du7a++tCVyyvMT8//8PSpB758V2fuxdl4IZ/xZquD6IqDAnzi
+qU+8+yn12w+v1NffoazUU1GHkwvHOdJY4OmfPsnVi5cxmeN0dCb/6Hs/fvc7
+T73j+kF09YEdMM/9+En7GESWJIppxxoRl4SBwJqCShjK0HFp7+XQBrZxUF15
+0IPGVBBaVArxQNDci5gZz3JMnmDaLOKbDrVNqOOaXOTmtgMkpkGiu5gF2I4K
+brqMAocnfChLRJ0T+RbjWXJT3n6AurND4GrEEKhrcrXFnthB08ZzfZSLUdrh
+lT4zVbs+qO6BZ8CXEW6ocbHADxWTfMLm7gb5TE6326WXzDDxRsTLmuvt9frr
+N34QD9Jhcbw9S7+1RDuYdsf8OXsggH//1ddcJXbYU1vE4hBCOH40eoTS1JA7
+rG8xypLqlJqK1507y4NvexACy0r6G9aClZVBuapmkkV25Ygv/c8nmY1muPDi
+L06fvuctz/5FgP+69B+M/A2qZEKUHCIsfNZaL5GHGl/4lEVJrUte3H+eb6z9
+N71ihsXeIcgdvSnBOqu6jhKO1wsc8ae4tHqRVd1i895z0YEcWBEvUwUWAhDR
+dQKjqT1ASlzhECGICDI/50L2NJFJWLKHUEKxMO5TJZamhDLdpdM7wXR7jkpH
+bFaVOxCAlh5WFjACIwzCBoSFpDKaWhd4yqM0FQjYD1L2q5SN0QaNRsy1okdu
+BEveHZyI72BCxTBVFGGE7XXkgQCcM0RO4FUBe7VFaw9TTDBU+E0PIQR1ZbDS
+ggUUOAvjesJYTLBlRFUqVjsbrLNNJ1mkIIKiOtgQmrjGCgikBjGmUA4jQTUN
+NY5qUuNHAdrXZPkEFSqEL7GlBVnjhYbaZOyKHVaHN4hFTNu2aL9KPLwqwIn0
+FDfNKqPuPr1Ri67sc7l7GSMs0dhiOh5l6GCY8Yb4QY5693PTbHJVvkDQrlit
+hmgk49pyRdXshBkLdZ+Rtyj+5mV03xNn3O/qizRCyYgKQsnhYJb3HXsv8U6f
+377yHOtqhSBXhNMN0nFGkk9xZ3jmSvWK97M3z7/u1w/fc/aR+VZY/U1BJIyG
+oKJCgdIgPALn03AJN369zqVfXWXi7RLKO/j8+z7wrx+4/4Pf/f/OHwLwyN+b
+hM08I7aOiVeD7xASBukuWztbbNwcItKYVqOBsdPMVkd/cNujWIYhToKnocLg
+hGGiarbYZhAIZKeLcQKnayxG3vZldEumZAnoGpgAFdjQsFFtsSNT8khRighf
+G8bU0W13oJn5ZUvja9UAT5ExxljD5s4WZTVLpCN8r02rgJ9fXXv0i088U4U2
+2u62Y6a74cWuUuWC374URMHIVNX1o21/+0+34Oq1FVkURVDXtbtyU+oX/A2X
+pv3wxZu3VLFTBM1m2v3O6NPn6a0sEQG9CMICEVmW7GHUS4fRK4cotyUuG9O7
+5yxHDv0DnZFHIismwQR0zbSfQDnBVzDfbn/v6MLcR8Q/feWRzwyj7mKhdGcy
+GfWSIpiSykxVpu4JnXQslZTJOhde+k8y8SxCgpdFqMRjEg+hhuTWEmZtCmxI
+JWLuO/12mr0TVDpBBgItSgKhEKWgU62zNYLcauZU/oy+q99++OXd0ZtaQYhO
+FNuNEqksGIMShrq2WGUQQoCRWGkpPYerC8j/aGIZIEwTQQNPVPhYQuXAFti8
+AmnQ2kdZQX/pLg5PL1GVMLn+wnH91Q/945u/8Oj581NTnXPtRkBsHE7DyDjS
+WrOWptzM9rgetdkcN8kZoEKPujYgJRQx2b5B5R5+Mo3WA6rKkGcpRSWRytHt
+tjh6+BDzvT5b44yd4YRrl68QDzYiDXBnolnsBrRDxWzpkJFH7YWUcZeJ0qTB
+Ud50qkVqXuHx8gmqQc211TU2x7fItwpMV+B3A8rApydOMiw11WBCrz/Pwtwc
+zdgnG2U8v/k8q2nBYD9luLXBfTMNXwD832NPnT+8MHOuGylsSyGlxDmBFjFK
+hiShJqs2QaZQLeFMzdjmTDBkgzGTtYzfX8k5/8wVbswLxuMxWvo0ojYaQZWN
+cOWIQDu294b02i1mW5E9Ndf5rAYYW499owlUDOMcTwqEA0GBcCUm8/CtQriI
+UVWAGJGZMeu7e4z3bxEpRapTLqXP0j32MDe3XqLK9smjjFD6aGvxRY1ScPbY
+YXrN5JWjM+2zHzv3+g39/cd/99DKrdG5PTlkfVzymriDDD0CX6I9ifYAT6JU
+jHOOduGBVER+E2NihrlF1CPqyQiBZTwYQpXTDqAhS7yyohPHLM7NsLjYYlGF
+z/Xb4QP/8tYzFYD+xVMXPnNjUK4IT98pXUXpcqLQpxtpOrFmphky12wz25ki
+UAHT0RTD8XWsFpRlgJ/X2HxCOcjphNOMshSRp0SRYDaO6PenWez16bbFhSiu
+/+1j73zjy6+6jh/9yeNqc2v7/md29u92Si/XUiyPjTuZlvXJtKqj3FqMkNxn
+90mCkE7UIglCnBPsDgesbW+yMxgw0Ufot2MWplvMJpqOV+7Ot/x/PnHX0mPH
+jyy6melZ91e/Bz73zf9d3B4Ol/OiuvuWbt1fFMXyZDK5M8+L5cLWlA5KZyit
+4YGoQSsO6TejzcV+61P3Hp7/1rtef6/9u3/Hf67e/7Vvnxlm4+W8LJeNccv9
+/cHM8WNHf/na06e++p6zJ8vVQSYOtSP35/r/ABPJ7DnErBKYAAAAAElFTkSu
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.ru.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.ru.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.ru.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.ru.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -1,147 +1,207 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>� ��������� FBReader</book-title> <lang>ru</lang></title-info></description>
+<?xml version="1.0" encoding="utf-8"?>
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink"><description><title-info><author><last-name>FBReader</last-name></author> <book-title>О программе FBReader</book-title> <lang>ru</lang></title-info></description>
 <body>
-<title><p>� ��������� FBReader &FBReaderVersion;</p></title>
-<p>FBReader &#8211; ��������� ��� ������ ����������� ����, ���������� ��� ������������� ��������� Linux, FreeBSD, Windows XP. FBReader ��������� ������ ����� �� ������ ��������: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, �&#160;�.&#160;�. ����� ����� ������ �������� �� ������� <code>zip</code>, <code>tar</code>, <code>gzip</code> � <code>bzip2</code>.</p>
-<p>FBReader ���������������� ��������, ������� �������� ������, ��� ��������� <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>. � FBReader ��� Windows XP ����������� ���, ���������� Independent JPEG Group.</p>
+<title><p>О программе FBReader &FBReaderVersion;</p></title>
+<p>FBReader &#8211; программа для чтения электронных книг, работающая под операционными системами Linux, FreeBSD, Windows XP. FBReader позволяет читать книги во многих форматах: <code>fb2</code>, <code>html</code>, <code>chm</code>, <code>rtf</code>, <code>plucker</code>, и&#160;т.&#160;д. Файлы можно читать напрямую из архивов <code>zip</code>, <code>tar</code>, <code>gzip</code> и <code>bzip2</code>.</p>
+<p>FBReader распространяется свободно, включая исходные тексты, под лицензией <a l:href="http://www.gnu.org/licenses/gpl.html">GNU GPL</a>. В FBReader для Windows XP использован код, написанный Independent JPEG Group.</p>
 <empty-line/>
-<subtitle><p>� ���� ������</p></subtitle>
-<p>FBReader ������������� �������� � ���������� ����� �������� <code>fb2</code>, <code>oeb</code> � <code>OpenReader</code>, ������� � ���������, �������� ���������� <code>&#171;�������� � �������&#187;</code>. ������� ������ ����� ����� ���������� ���� ��������. �������� ������ �������� (������� �� ������ <image l:href="#settings.png" voffset="-6"/>) � ������������� <code>&#171;�������� � �������&#187;</code> � ������� <code>&#171;����������&#187;</code>. �������� ������������� ����� ���������, � ���� ��������� ������ ������ ����� � ������������ <code>fb2</code>, <code>oebzip</code> ��� <code>orb</code>, ��� ���������� �� ������.</p>
-<p>������ �������� <code>����������</code> (������� �� <image l:href="#books.png" voffset="-6"/>), �������� �����, � ����������� � ������.</p>
-<p>����� ������ ����� � ������ �������, �� ����� ������� �������� � ����������. ��������� <code>������ ���������� �����</code> (<image l:href="#addbook.png"/>), �������� ���� � �������������� ���������� � �����. � ��������� ��� �� ������� ������� ��� ����� ��� � ������� <code>����������</code> (<image l:href="#books.png" voffset="-6"/>).</p>
+<subtitle><p>С чего начать</p></subtitle>
+<p>FBReader автоматически собирает в библиотеку файлы форматов <code>fb2</code>, <code>oeb</code> и <code>OpenReader</code>, лежащие в каталогах, заданных параметром <code>&#171;Каталоги с книгами&#187;</code>. Поэтому прежде всего нужно определить этот параметр. Откройте диалог настроек (нажмите на кнопку <image l:href="#settings.png" voffset="-6"/>) и отредактруйте <code>&#171;Каталоги с книгами&#187;</code> в разделе <code>&#171;Библиотека&#187;</code>. Каталоги перечисляются через двоеточие, в этих каталогах должны лежать файлы с расширениями <code>fb2</code>, <code>oebzip</code> или <code>orb</code>, или содержащие их архивы.</p>
+<p>Теперь откройте <code>библиотеку</code> (нажмите на <image l:href="#books.png" voffset="-6"/>), выберите книгу, и приступайте к чтению.</p>
+<p>Чтобы читать книгу в другом формате, ее нужно вручную добавить в библиотеку. Запустите <code>диалог добавления книги</code> (<image l:href="#addbook.png"/>), выберите файл и отредактируйте информацию о книге. В следующий раз вы сможете открыть эту книгу уже с помощью <code>библиотеки</code> (<image l:href="#books.png" voffset="-6"/>).</p>
 <empty-line/>
-<subtitle><p>������</p></subtitle>
-<p>���������� �� FBReader'� � ������ ������ ��������� ����� ����� �� <a l:href="http://www.fbreader.org">����� FBReader'�</a>.</p>
-<p>���� �� ������ �������� ��������� � ����� �������, ����������� �� <a l:href="http://freshmeat.net/projects/fbreader">������ FBReader �� freshmeat</a>.</p>
-<p>����� ��������� � �������� ���������, �������������� <a l:href="http://groups.google.com/group/fbreader">������� FBReader �� googlegroups</a>.</p>
+<subtitle><p>Ссылки</p></subtitle>
+<p>Информацию об FBReader'е и свежую версию программы можно найти на <a l:href="http://www.fbreader.org">сайте FBReader'а</a>.</p>
+<p>Если вы хотите получать сообщения о новых версиях, подпишитесь на <a l:href="http://freshmeat.net/projects/fbreader">проект FBReader на freshmeat</a>.</p>
+<p>Чтобы связаться с авторами программы, воспользуйтесь <a l:href="http://groups.google.com/group/fbreader">группой FBReader на googlegroups</a>.</p>
 <empty-line/>
-<subtitle><p>�������������� ����������</p></subtitle>
-<p>FBReader ��� Windows XP ���������������� � ��������� � ����������� ������������, �������� �� ������� ���������� �� GPL. ���� ����������� ��� ���������� � ����������� �� �� ������������� (�� ���������� �����).</p>
-<p><a l:href="http://expat.sourceforge.net">Expat</a> &#8211; ���������� ��� ������� XML. Copyright &#169; 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper.</p>
+<subtitle><p>Использованные библиотеки</p></subtitle>
+<p>FBReader для Windows XP распространяется в комплекте с несколькими библиотеками, лицензии на которые отличаются от GPL. Ниже перечислены эти библиотеки и ограничения на их использование (на английском языке).</p>
+<p><a l:href="http://expat.sourceforge.net">Expat</a> &#8211; библиотека для разбора XML. Copyright &#169; 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper.</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
 <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
-<p><a l:href="http://libungif.sourceforge.net">Libungif</a> &#8211; ���������� ��� ������ � ������������� � ������� GIF. Copyright &#169; 1997 Eric S. Raymond &lt;<a l:href="mailto:esr@thyrsus.com">esr@thyrsus.com</a>&gt;.</p>
+<p><a l:href="http://libungif.sourceforge.net">Libungif</a> &#8211; библиотека для работы с изображениями в формате GIF. Copyright &#169; 1997 Eric S. Raymond &lt;<a l:href="mailto:esr@thyrsus.com">esr@thyrsus.com</a>&gt;.</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
 <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
-<p><a l:href="http://www.remotesensing.org/libtiff">Libtiff</a> &#8211; ���������� ��� ������ � ������������� � ������� TIFF (Tag Image File Format). Copyright &#169; 1988-1997 Sam Leffler. Copyright &#169; 1991-1997 Silicon Graphics, Inc. Portions Copyright &#169; 1985-1987, 1990 Regents of the University of California. Portions Copyright &#169; 1990, 1991 Digital Equipment Corporation. Portions Copyright &#169; 1990 Sun Microsystems, Inc. Portions Copyright &#169; 1990, 1995 Frank D. Cringle. Portions Copyright &#169; 1996 BancTec AB. Portions Copyright &#169; 1996 Mike Johnson. Portions Copyright &#169; 1996 Pixar. Portions Copyright &#169; 1997 Greg Ward Larson. Portions Copyright &#169; 2000 Frank Warmerdam.</p>
+<p><a l:href="http://www.remotesensing.org/libtiff">Libtiff</a> &#8211; библиотека для работы с изображениями в формате TIFF (Tag Image File Format). Copyright &#169; 1988-1997 Sam Leffler. Copyright &#169; 1991-1997 Silicon Graphics, Inc. Portions Copyright &#169; 1985-1987, 1990 Regents of the University of California. Portions Copyright &#169; 1990, 1991 Digital Equipment Corporation. Portions Copyright &#169; 1990 Sun Microsystems, Inc. Portions Copyright &#169; 1990, 1995 Frank D. Cringle. Portions Copyright &#169; 1996 BancTec AB. Portions Copyright &#169; 1996 Mike Johnson. Portions Copyright &#169; 1996 Pixar. Portions Copyright &#169; 1997 Greg Ward Larson. Portions Copyright &#169; 2000 Frank Warmerdam.</p>
 <p>Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that (i) the above copyright notices and this permission notice appear in all copies of the software and related documentation, and (ii) the names of Sam Leffler and Silicon Graphics may not be used in any advertising or publicity relating to the software without the specific, prior written permission of Sam Leffler and Silicon Graphics.</p>
-<p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; ���������� ��� ������ � ������������� � ������� JPEG, �� The Independent JPEG Group. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
+<p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; библиотека для работы с изображениями в формате JPEG, от The Independent JPEG Group. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.sv.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.sv.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.sv.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.sv.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -28,120 +28,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; The Independent JPEG Group's JPEG library. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-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
-L6EAAAAASUVORK5CYII=
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFiIVNd73
+uAAACXNJREFUWMO1l2mMndV5x3/nPe9617l37szYM+OVMXbGGHATO6ZesA04
+JjQqNBtKgWwKigNlcZUUukREDUIKJU1oVUSkqIkVURwsI4PsELCJwQFDvWMb
+jBnPeGYym5eZuXOX977bOf3QUiEZV5i2z5dzpOf/6Pw+PHrO/xFcQuzsf+H1
+3f42e/jM2e7yVOC1F+awsHmRv2b2qj+d785/iY8R4qMKh2u9LZt6fnVm0+hj
+JNqkUJhBTk5n4LVBVk1bFn5j5W23Lmtf/eylAhgfVVixJrr2T75BNQUqaxOL
+iM5ZreRnOmw59G/23/3mwWeeGP7R7f9vAHU5NafP78PzpiGTLNK3KEqPfMaE
+tpjDyWH593se2fTEKz/dcCkA5kcVvn56/xzHFgSNEGkLIGKiNsXSq1dwdN9J
+lBFCOuLRsUf+5Z97Hi+ubL3ulcHg1Iod1WfmrOSGvuuyNz7RWmop/48A23uf
+W/HbY9sXlUqlw9//44f3fjB3Ohy6pmpHGK7Gsi1Qmpqq4BZnM7t7Fsf6DxNW
+oRhY7Ozf8cNTzjscyb7OdaWbeGPwFcaHxm8frg6tbs90nP3QJnxt8tVr/vHA
+w7sPnH3bTlREWqRo1dOH5pUWjBpZ6b3VONQ9lh3BkwJhakxh0uK0cuXsxYwN
+j3DovQM0nDptC1qZZnbQn36P9spM8m6Otan1nJw8wblna/9+9/X3r148c7H/
+/rvy/UvLuvw9z1V/varuxERpH9+tMWVM5qaMyfaRZLjlrDGG2WxgSUEiI6Rr
+oEVCpTaFcAVWUZLtTFMrljnnjtI20YllmzRMnxE1xGJvGft79ncMnjvd/ebT
++zdf0ISRDpNYRGS0R0Z4ZFwXO6OomGeom2exUzGmjhAaHMdB2wrtKSaCcSaC
+c+i0xvCg0CjRHs6g4BYpZ8eZtCeYzkw+Zaxg7vQutv3h6Vv+6rV777wAYGX3
+6p9Pq3eGZsNETwlETSC1gWFoLFdgW5KkGmApB9v0ULEGCdliFukaCFOjpMI0
+TWZMdDEkTyNDiyv0Er5ib2Bf401e6n2RKWeSPW/t/toFALdM/1LPZ0t/9uPQ
+Usi0jeOlsR0PLQWNKEQaDvlUCUd50FDY0gItkFIixH+dWoCpGMj00BJPJ21n
++KL8Kk9sf5x/+Nmj9GX7aJYtfGrup3/xoZPwrfKRzLqD6/qJkyKxIuWaSFuC
+AZZlY0kbNRFTpkxbVwnLMZGxRGKQbU1T11VkzcRoUph4zE+uov9cP3u3HkRr
+TZjzuYqFm3fd/satFx3FXz/85RcP9Ry6wU818GUN05Y0Z5tRkxEnDvYgT3no
+aTEVFdH+ifwLS25Y7JZT46sTmZAVeXy7gq/r5MIC1lCK/VsOkbGyVGUZUVJD
+v12xb+FVs64oX3QS9lV68xU5RWD4mJ5FNp1jfHCCngN9NIZAKEGlHpGaFM9/
+t/TQnRu8BzZ0BrN+j4yRiaBarjNbdJFrFCjXJ6m2VRiUw8jI4pt/tOG+Dz5+
+AcCBscOLBmt9S3U+IbYjGmEdERsE5wPC0YQWmcMpGngmLClds+X+dfcPrs+s
+P9HFgq1u7BIZDTrznVQnaxRSzSy6fBH5VAYjgoLTRG3MH7/oX/Do0Ue6v7/j
+wd/U/DqKBGkKhBAEQUClUiMIQMeas7qKFzgsvWzpy+/Xzst3vdwUNdFwKlRU
+lTDn8we/n4Jd5Luf+1tuvuxmRvvPsqf/d5tePLnt2gsAPr/jxh/908EfH99n
+/74jK3PEUxrVAMdywNBYKYN8m4VKKbABQyHlf88wkki9o9R/NpQvKsRGjMwJ
+huvDSBe+dfO3uGvD3YwOjHY8+PRDuzZuv++He8qvSgB5x5YvfeXV8y8/5rfW
+SYox2WoGhMZ0LEIVYQhBc66Z6aVpBI2ArGdRs+sUdMuRd3a8ewRgyX2Lr3jH
+OvJtqSwSCyzl4OAwGY3TG77LGXuY+YUF3LrqNp4f3G4c7Du46kTPiaX3bLxn
+q5EpZD9peS4oA1WRVBoVMAWGZaB1Agl4TorpLR3M6ZxDLluEvOBY460vbN77
+zAyAIWtgbWCFqEBiBQ7ChyiKSFIBQabG8dphdk/t5PWp3dxy22dw5mn29O5c
+v/vYznvNjJdLXOVRn4pocrPIpgahCEgCH8uxsYRFWA1pnd3GmvVreP7AdsLz
+IcOj/Z/73tt3NW48eu3vTsYnvqi0AEvjxinqokJsh8jYICcKRCJmPDdML2/T
+FrQSOJM0zUyRbU0hH/ibBwdS5OckAZUoikZSDTcXJrGt0prE0YSRwrQdGkaI
+KgraO9pwcg5WkyQ/L71QFcObIoIZtmkRqxihYlKGgFgRS5c4NPASG60VdVMT
+mYqju4fonOjkG1d/+4EP9YT3Hrxz6fb3nttWz1enua5L2sxCoPA8D09mUWZE
+YARYWYmyEkIdkE6nMU2TQAtM0SBxEpTnoquKVulRiyYIcgp1PM3I3jOszK19
++Zdffuq6i5rS5b+68oHR/NAjsRuTdly01pgWEKewUybKBtMFLAMhNK7tIYRB
+wc5Rq56hInwC00ZNGSzrvPqlyclyX9VOmH2iM5xbnLd3+Yxrn12WX+5f1JIV
+0qWeMXsMP64jhIFjmSjDwEwLYqmIVUgUC1zTRQoTFWmkEAzGISePn6JyPoIG
+XB7M2fvk3ZvXXbInPBdPtpRVDdO2sUWWuBEThBGm5yMtiekIhBaoWBEmIUJK
+crk0ncPNjPVILCNCiDzGZKbvY7nikejM1XUdIHCgITGVi2enkZGJTAxEbKIi
+iANFEoJKNI7t0VLoRqkcwktBVlLV5/MfC0Da8TWuKdHVkKgSIqKEeq1MUtXQ
+sDBCSVxNSBoKoQVJmOD7AfOdEs3KxEpCIrNKVExaLhngod3fywgVdsskwYw1
+OctFEjEwOMHI6dEBf6LeJxITlETHmjhW+L5PpVKmng1opENqZkxkJLSVWocu
+GaDUMiNfkO2yUouoFMuM6CGCfuGv4/o7an+RzOr7/Ojcxy/7+XfmxZdzPhom
+cCZQ0qcancfNVFGWoins4Kb0HQMPL3/yLz/Wbrip9xcbtx3Z8oMz5ZHM3OL8
+d9d2rfvzr3Z/7cAHNT849tc/2Tr61L1TqSlcK40KFNfOvp53dx1nbeeap/5k
+4We/88lpa8r8b2L/8JszL5Y7VNtv37fvrl1dWzv0ghfm6lW7VuiNRzf2/uvx
+J9f/n2/HF13ZB17K//rUU4/JlLnoypYlm5fnrvrZlaVPVz9q/X8A8yhCVXd4
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+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
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.uk.fb2 /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.uk.fb2
--- fbreader-0.8.17/fbreader/data/help/MiniHelp.win32.uk.fb2	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/help/MiniHelp.win32.uk.fb2	2009-04-30 22:26:45.000000000 +0100
@@ -28,120 +28,180 @@
 <p><a l:href="http://www.ijg.org">Libjpeg</a> &#8211; бiблiотека для роботи iз зображеннями у форматi JPEG, вiд The Independent JPEG Group. Copyright &#169; 1991-1998, Thomas G. Lane.</p>
 </body>
 <binary content-type="image/png" id="settings.png">
-iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgI
-fAhkiAAACAhJREFUWIXtlmtQVOcZx//nuvddgWXBZUEuahWQmzqI8UKsouJE
-Y2qt7Uynrdrxi1OVYEF0UqcpsGJ1tNZkSIyZZDptwrRaDUaIhqGdxppO0iji
-hQUVuS3swsIuLHvupx/CZlYFsZMP/dJn5pn3fc95n+f/e573nTMH+L/9j42Y
-bkNNTdVymqXfB0gdCNyXBeHDYFB46/Dhw9zzilQff6dIA/WLkpKdvv8K4MiR
-IyaVkAJpqbORl7sQ/kAArbdbOO+g180FhYKDBw8OTCd+5MS7+xVVqaEoqlsQ
-pOWHSnc+inxPPiu4rKxslCapld09j8b9gYDiSHBg7Zr12qzM7CSDSXf+WbF1
-dXXU0VPvnWV1ml8tLihAYkqKnWGof1eeeDvruQEAoLS0/O+cKK365MplUlVV
-XpIkZC3Ipgx6w4Lqo68XTlr1kXdMDwfGm0xm89acvEUGVqNBgsNB2R2OaFIl
-b9bW1jJTAlRVVcU8+axif8XnAPyiKPYCAM/zSE1NM7C0Zsuk1Drqq/j4+Pys
-3BwDRVMAAFmR4fV6ggRB/HjXrl3ipABOZ+VaklYHT5068f3I59XHqnMBWGia
-DtI0DZIkYTQaCZqmUybTJ1TEzJmdohEEAaLAQxJ5tN9t4wRebCjfu/0PkXsf
-A2A0zNmc7FxIivTH2to3XgaAmprKHEJSLs1Jm/uawWBI0Wg00Gq14DhOBeB+
-UtzprLXIijxDkkQIfAiyKGDQ41F9Q94RgpN/9uR++jEAhhlKdCTZk2el0H+9
-eO68s6YSCoDMBQtOrVhWWKGqqlaSJNA0jd7eHkkUxccKOFxbqyc4tnn+vDRR
-lSXG7/MhFBpHX5+HIBRlU1nZztGnuhW5OH6ipjJ9fmZZbs5CiiQfvx6yLCMY
-DEJRFDAMA17g0dBQzwmSuG1/SfmFw7W1em2IacrKmJNntpiYllbXeCAwdhcq
-PoWKa+Ul2y9MelyRi8rKyjijWe/a8spWM8uykGUZJEmCIAhIkgSKouDz+dDa
-2gqbzQZbnA0NDfUcL8obFSb2YF7mvIKoKCN741b7+PCw/82yvdtLJxONNCpy
-0dTUFCxat8btcrWtcyQ4aKvVCoZhwDAMZFmGPzACRVYgiiII4mv29IwM2vVw
-4EdZ6d9xxNmi2dY7HSHv4Mjb5fu2l0wn/lQHwnb0qHMTzdJnjAajLsZqJYPB
-oOLxDNCiKGo2FL+kCrxIAICqqmh1dcMaEw37zFi03Ong+93eM+X7dux+HvEp
-AYCvv2QPHtxLVykijlSIMYbR35Tl0ByKYT9bW7TeIPAiceteJywWCxId8bjT
-9hDuni6BV4ZmH3r1UPe3BpjMktZXpceasSMjgdq9YuE8NsZiwKwkO9o6HoEh
-CSTZZyjXrn82ND7GZ1RUVHifJ+e0n+KwpW6o3q5lmX+9sm7FnpAmlfrd+Q4Y
-LdHouN8NKDLS5yYhISGRzM7KjdYZNV86nU7L8+Slpt8CpGyo2siy7Nkfbi7U
-Fy5MJrV6Azk8yuODxpvITTUjP2cuaJoGz/NwOBJJWZIN/tHhzUvyC95tbm4W
-n5V7WoDk4qp8mqIubi5epg/yKv5xy41O9zDsNgsGPH5ZHnfLS3LnUAABiqLA
-cRySk1NIf8AfJYr82vz8gvebm5vlqfI/8whmra9eRZHUlfWr8/UKQcHrG4P7
-fgu6736O8WAQoyE+6A2K+y43fswpqgJFUUCSJAKBAF4oWE7H2mw5MdYZ9XV1
-dVMWOiVAWnHVLoalPtpcvMyk1emIPo8fw333EAqOIMGRiI5Or8Dzwo3zpw+e
-VkTp5YbGS7wsSwAAgiAQDAZRuGIVazZbVg54+/6kquqkF/4pgLkv/daassFZ
-rzPoj/1gU6FeISmIAo+xARf8wz7Y7QkYGiWF7r6BdoTUjQBQWlreqKjKlsuN
-lwRe4EEQBGRZBs/zWP3dIlar0W48/cbJN6cFSC6u+oUE8aHdbluzbfOLBgUE
-HDFa9Dy4De/gIOLj4zE0RgmdPQMucHjhwdVyfzj21b2/rIeCbZ9cucxzHAea
-pr+BWPXiGg1FMz89+ftjB54E+KYtKcXOFayG+Shzfpo5KyMFM/QUZkZpce7j
-ZnR29SAu1gqBskht7b0u8FgaKR5px08e3UaoxHurV69lWYZFIBDA4OAgHA4H
-Gq9c5kReth84cGD4qQ6oUFfF2WJMq5fOQ0aSGWkzTTjXeB2dj3pgNppA6qy4
-19E3KhBS0VTiAFCyZ/8HJE3tvHq1UQhxIfj9fng8HgQCAURFRckkqSya4giU
-Ti1Dhkw6Gl39AZy58AU6H3aAZjSITUhFa1t3iB/zbu2pP+TDE/8REd2kAWj2
-7N73Z57jS5qbPxWioqOQnp4Og9GAkZFhMhQS2yKDKAAsAL0qjHk5rePnoDTa
-UU5C14M2CLyApJS56Hb7BZ+3/2JPk/MvALQANBNx5IQoC0A/4QYAhqtXm1x5
-eTked797+YCnX3C57knDwyOHXv/1b65P6BIAFAKAZSKp1rboJytNM+fXLl2c
-qeUD/QCjh0IZ8OVXt8f7/vnW93hf5yAALsLlCZciimEBMOG51WolsrOzo9vb
-23u7uroCAAQA4sTIEwBMYQAAGtviHUUGW9pRs9kgkxRDDfv85FjPjdcGWz78
-WzhowrmIuRwhTE/AhKtUASgRoOEcQrgDRASxDgBjTMyKNiYsWQiS1Ad7W26M
-PrrmiahWiOiAOJE88h6QE2PY1QiI8PyxgMkuU3iMfK9ikgTf1v4DrpeFJVeZ
-L6EAAAAASUVORK5CYII=
+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
+BFAAAAAASUVORK5CYII=
 ====
 </binary>
 <binary content-type="image/png" id="books.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA9rAAAPawHzS2yFAAAAB3RJTUUH1wIFECMDtXeg
-zgAABUNJREFUWMPVVmtsU2UYfr5zabt2W3e6nXYr3aVjY2zDbtxHwGG4GI3B
-amJi9A8STfSX0fhT/Gc0Uf/AfxMkMcSoQMVIgAUwoKJmsBUBGSuMyVjXrlvv
-PT23zx+udB0bO7olxDc5Oed833vyPO/zXr4DGDTR528Sff6qedbNC6zXiD7/
-gXnWiejzv114ZwyCr7ay0iUHN7V7LrjJbDkO4NU563aeKCcFU+p534ZNZPae
-yWz5TBBd+wvvnAFwbxmbP7O22ebSNPMhwda7I5uTbjAMa0/y1j2dW55Zf+n0
-0ROz/G08Ub7vWMFsqK4SEYmyP2/cuu08ADqZr9pUv27HzlR0NGqIgOjzr7Aw
-+b5ub5nHXmkDAKtDsL9FKcWfYcC76mnkVE6f5W/hiHqsrRbbVrgEAECDp7YH
-QM+diAKPuxdZ3VaCwT0C3Glm5DO+JkuzYC8v2bsZpqho3Y1EjgGRJsiMP88S
-7atWp76rwV1T4j86qYDWbYVE7AClixMQfX7BRORTa+r59hqhomRvKKyhvGUX
-EhIHKRlBdvg0MTOUUyl/eGWNusfrEUtyPhZToIibIbMOUJ0+hMXNA17BE+WH
-Tg/X7aqxl+yFJlSUNe9AUjYjn45BGjmL9a2VCN5JfypYFdPKerHEPzytICes
-h2pyQdf0eZVm5oCXcUT9rt1NeuqcpZ11J6KAb9yOlGJFPhNH9nYf1nrLcHdS
-h92imVY1iiCkGHwkoSJV0QXN6oG2AHgJAdHnN3FE/batlj7lqXU8lEPG8yQy
-eiXkXBLp4T50N5pwbwrQ8km0NdWUgMdSKqYtHaAVXqiq9sguY4oP+qEWUX+2
-0V2NuTnUXT3IEQFyLo3kUB+6GhhIGo9YPIN2rwiGKQqZyGgYUz1ghVYoirro
-jCkq4GneBktp5OG4Cs21GaTcA1nKIj7UB5+HorLcClWjcHdsRSiiQ5sprkhC
-xX29HozZjrysGpqwD4pwVVsbnljzIvpOBkDT98GUCajyboacikNTZEzfPIs1
-dQqqKostubO3BwzXi3PnL0DKZWCvb0STUIfQjUGjE75IgBCCHl8zdbveIGOx
-LKaSWYSjCSSnJzEx3IcOZxbVVaUtSQCs9rphr3wO45NphKcyiKcl/Bub04YE
-PMdQCwcQXQdAoKkqcfIxiI7KEs9UTp/1FaGFIizcjBJY+DAi/1wmiwW8eyPG
-YgooAJ0CoQkFcvlKzB0rszvhPyowD0OGxb69r+C3/iAGBwZAwcDV1YZsNg1Q
-LNkWJQAC8ByDLes60dTYiHAsg/FYGplsBsthzFI+po+bAB4/Afr/SwHHsVDk
-nLw8ClAAIIZ5cCwDLR7KT4yG9i0PAUIoIcbGDssyQPovZeTa7y9Hg4EzSyZA
-AJ0AuqE8MwSsNK6Frv6yNxoMBJZcAzMTj1KDviZlkg4PXHwzOnj8yBKLkBTk
-pkaJltE4vXXlx3ciA8c+X3IXkJmDp1iEC4tACGAlKdy6fG7/xJWjB5ehDQlA
-jEYO2NgcbvWf/Xi8/5uPlnYWFCKfB3whNnJmCsO3rx1U5Pz7hgcRpXTesqK6
-TnN59WFwqpPRe+OMNudfX5WzdPxu6HBeyr4bDQYWVYwtPOg2D08t9p3VDoHk
-JAXpnIJsJoXr/Rc/Gbx6Q6xx1zt4nicZSUE8kcDVX88d+WPwypeRhLTd4XQj
-rwGjI7eVyxdOfa0q8uvRYEA1qu4Dc3a9sLuls/tDp6tubVaSrg8F+z8Y+enw
-CdHnLzeZLe81tLS/xDCMPjJ07Qs5Lx2IBgOa6PN3EkJeY1jOpqnKaQABI5EX
-7G/d4Snob6JgdQAAAABJRU5ErkJggg==
+AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH2AsdFwIdr0Mx
+HwAACg1JREFUWMPFl1uopedZx3/v6Tuubx33mn2c2ZNMMulkstudZBwDNqUp
+o21i8bYXVa/sRa+KdxW8KAFrJSAEggWxII221KYXNWolxdBIQxqa1Exm2jl1
+9sweZ58P67DX+s7f93qxixAEISL63j8vP57D//k/8P/8xIcNeOv+3UcH46OV
+v1nrr1xf31zZTYvVw2l8qsxzIkqCbDw51Wu9+MefffCFZx/7yOh/DPDmlu3e
+3RqsvntnfeX9zb2Vtbhc3bVmdaKMAoXwLHYyxTgOMi/ouiHZaAJJjs1KVmY2
+RhcfOvvCp86de/G51eXJfwvwt7+IV9++u7ny3r31lXs7GytW2JX16NQiFqiA
+yoKQeI5PM2zRCAKeUNeYb4cst0NaRlMUku+99iZDIm5tD1ChoeNpzva7hxfP
+LH7tqTNLX3/u3Nx/ARGf+Mpfv3P5SD856SxQuT4idPF8zTPEdALDYtNhOVLM
+uxkndE5LFniipBAPMRNI/GqI7zusxzlf+vq3iJcf5/1Bxv4AMJZWJFlsKs6E
+au/xdvgnn3zw9F9+6uJHkg9k4LVXvmvboUecJFjXR/kejg4JXI8g8PB9F+NI
+HKNQSiClRFU+A1vSDSNG2ZDad/mzL3yVNz/9NOMbBbfjlEIbgvkFrDH0mj4n
+fYdGerR9tt97/rOz5hvPPnkq1wCPXrhAWlbMCAclDJHXJOz6v2K0IAXWVhRF
+QZJOSbIMlU2I64xk+9/JiXHDFnWSICYVrm1Q7N4EP6Qwls7SAu2wifIlqbBz
+P9u6+RdV3Pjyq7e2/kgDbCdj0vEEv9aYtET6DXZ2M4QQSO3gBT6O56Mdg5QK
+P3AJpKKlXVwXVNBmOE5onWjjC8u0jqGjQQqKvfvsxmNGOy3Onl7m6QsfI3Q1
+3/zBP5yqAueLGoDNAZ3AIRdTymZF0oF5r4+UGuU4oDSFhbICIQSOY7Clzyge
+YiufYVyzdnuD7Xab2rO4nZwLYhHpBWxPYkZVxWhnnys721zduIMVFRQ+P3rn
+OhrgzuYhnWaH6eQIpQoCb8qbFEipkcpgpSLLS6ZJSmVBKsORcRlMpxRoto2g
+3szY1gtsbIxgOGYhipCi4mSkOOO1cNx54jRhOJ6QFTkbzRmm9+6gn/nT79rf
+/7cJVatBQYQjQOQZSt4mz3Oq0h53ghXYogAEwhj8IsZWUFaaImhwupphUmv2
+r9yF8T57t69ifI+o3yOY6dGaX0A2QjQ13V4Xt6yZbTXRprxNtb9LftBACY1M
+E+x4hBe0kVlGVZRoCbKy1FWJlgrfcdmpBwR1hgek3Q7BpMOBZ4iUoG5FOOfO
+oR1N7TrspAl3r11DVOBLh07Uwl9e5uITj5Ti6lqy8Oq/vL1Ra42QKdIOUSRk
+lcA1mmYjpBOGGAF1keFpRej5nOguEuZDXBVzRxW8+713een6TY5w2djZBnUG
+HIUODTp0EEIQaAenVqTjmLbe56tf+sJv6cce9DdvXLuOEgITupSuIrUFzbim
+LEustZRlSVEUGGMwxlAUBY4RZJXAD7uckYLJx5+gcfkK/YdX2BhrSCuUdKlq
+g6RFe24R2WgySnLidspge40XvvXDz2iASlsqKpxS0MHgWqDbpa5rjDEopajr
++li5hKAsS0odUMcNqnSCFJq5pdNEjR4WF1f7WJOQT/chUVhVY9KQfr/DI4uL
+SMfljX++w+Bw/6IGGMWKJE1R2Zi5oEHLNdTFLnVdH6verwCEOFZBay2pCWm4
+mrKyKCnASsbDMVG/ot/pcri7Rh4PwVqKcsrG3iYbV94B7UFVQhCyO7h3PIYn
+vIig3aO2OUFoQBQUpovvOzjmg8sjzSCOE5zRFlUO2XSCEzQo8gKpLM3Io1tW
+2LqHNJosKxBCQH2cPS0tQmkKVdPy9DHAKDtklEuydEo4lShZk03uEEURjuNg
+rcVxHMIwPP4kz+i1+2RpjK8dcD2GW3cJGi7tnk+bksOJS292HmHBVZrA83Gk
+QlowxmB9ycW5J9FffvmV3/vKD98iqyU9z+ex2XlORi1McUA3s4RhiNaaAIdY
+1VRVRZpm3N07JEtifFdTq5z3bt8jE4o4S6nqnJl2m2YjwnUcXCUJjKEsCvJ4
+ipSS7YNNHvv4CvqN99e/eWtak0qXsE7517fuUezvkTZ9jDHUdf2BZrTWIqXk
+3EJIlaVERtNtRkziDKe9xGBYMhpmLHYisumAwfaI6WjIaHDI0WBAXeY4WqGi
+JpcXmujZoy2ODgt2pzVITZYn5OmE0REgBFgLjoNxHKqqwlqL7/u8njXRSuIW
+BZHcR5cWKQ37v9gijhPWsvtURUan1WSm16YfSGa9JlEjIAwDYhOxsX7n2A98
+/zvfXi/z6hRC0ej1GY2PmKSCCsvhZMJgOiUpSwZpwv5wRJwmTA9rtg72KKgw
+tcRYgeP5JFpS+S4zyQG+71PXx2XzfZ9ut8v8/DwLCws0WzO8/oO//7EGiMIG
+jX6I74ekRcnCiT6t0EMbQ1Fb0roEbaiEpKhragEcJYyzBCsFRVKwc3+XH//k
+J2xOjljb2yZonqAsS5SjcLTGdV2cICJOCq5cvc7a7dvYZHQ8BUHQIHB9XEfT
+CDxarSZVndFoODiehxAKxLEWVPZ4OckAJrlglEyZlAnCTSn27vLg8gMgMn65
+k3E0GSGEwHdc8jwlv3ETW9cURYFX53z03MPHAMY0OIonVFVFWaQcjQe4/RPE
+cY5XALWAqj5uQARCCEa725RKEKdT8rQgyyz3Ngc88sAKg3zAeDKkKCxlnjKx
+MZIaJSGKInrtNgtNh0/8xq8fWzLpN8jTnChsUWeSpVOLbMcZkzhnPxkRj0ck
+0xhVg5ISaSFsNSllzmg0pc4KDkdjJmmB8hoor4lrJuTxFC2h12rRCAMagc/8
+bJ+5uRM0Rf7LCx89/7v6+//4evD+rbVTUhk2RkfMz3Uxk4xu00dKiavaSLGA
+rGqMkAhq8jwnLSR5meAryEYj9pIxkbaQjKmmY3oNj6V+i6gR0AoCHlhe4snV
+j+FouXHzxrXnz58591dPX1yt9cvf/s5r9/dH1MohTWOWTy6AKFk+0aPZiJid
+7TPb69KMGrSjJr53PI7ZUQUiI5sOEEnMaH+fhZkurTBkaX6ObDxmaXGB06dO
+sjTfxzdmL5scPN/otL/xh3/w+Q/a8r9744p85/LPW/c27p+9fuPKb4a++XSe
+qkfBdrUS1FVBWeY0fI9mFCGl4FR7jmbToRsqep7mxntX2Bom9B5dZX2aMGcs
+jzz8EJv31w+n48ELv/Pbn3np0iefnnyo2/CffvS2+7PLlxeuXrv1+MFg+Fxe
+sVpZVsqydDzPI03TY2/gOARB8J97o65rgqP10fnz51985pln/vzSpUuj/7Xj
+FOD1n15t/PS9n58+ODj4teFweCnP85U8z1eSJEEplYRh+NIXP/fs15566qnD
+/9NT++VXXpUfNuY/AN2DyvmFX+9DAAAAAElFTkSuQmCC
 ====
 </binary>
 <binary content-type="image/png" id="addbook.png">
 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABmJLR0QA/wD/
-AP+gvaeTAAAACXBIWXMAAA+XAAAPlwEpEhtWAAAAB3RJTUUH1wIFEDYsKRN7
-gwAABC5JREFUWMO1V11IW2cYfr6Tk5MTE40ajkm0xVbbatkaFUY7xoadbWGF
-UZlMZOxijIErbHRXg93uYtdju2yvynq1tWyR4XBjjMFaxsQiapuqtNRqJelJ
-NMbEnJyf791FjtmqVZMYHzgf5IHzvs/3fu/3nDcOlAkl3H/FE+ikjfjs0y38
-K55A55GN+OxiOfGEMpN/Uu/MfC0LWmgLf9IfbBkF0FHuhsQykn/QVJP7NnxM
-EVZW09eavW/05XUjZsJ1CErbYLC9R0nGbuFABCjh/nf9cu5auL1RkJxOBJv8
-SrDJf0UzOOZSjfAcOQ1N11AJhBKSX2xw5W50HWtwSpKzyOsmYW7VB++R16Dl
-LVQKYY/kvT4p90N3e71LdklF3rAIs0kP6tpeR24fyXcVoIT7T9c6tUh3e53H
-7XYVeYsTHqgy6tp7kdU49gthh+SnPKI22t3m9Xlq3EWecyAad8J3/E1kqpD8
-hQKUcP9xtyM/1n3U46/11hR5IiAaF+A7cQ7rOUK1IGwn+M/hVjnkq/M8x88s
-6vCdOI90DlXFNgFNh9qCMa0BeYOKZx5d5nAFXobBZFQb23wgGApg8J2PcCsy
-irS6BCbXo7nnFOJP5nbehZiFt/U7dLXe/7jmU+mCTY+NDOvXKzKiw4F6Ghq4
-xJaTGcSTGcSSWex26kzQ0XEyi/Ndn58h0Jl0dhXf3/4mAeB6hdeQgTFGAmME
-xggMxPYIJIkyLGcWCXoAr9tXeQ8QbZXy37o3mB2DV8+KSwIVl4JfkFWyarHi
-jIyDgQBGYIKxmdpeLQAQL12V3FvfHBnWc/sS4A2NorXzT7js2Mxe6r0dILsK
-gsAQaGy5TKDLm5UhEFLpJACd7SqgFI87Fx6C4lfAwQuhiYPAkTGTBVGSgYuv
-DoGDg2DBIhMCEzF25yaA7H6PgLBuPMPTtTuwyLD3xsHJAocFTiYsMsFhwiID
-nAoia0UFGk+X0AO0twCDNITkTlhkwIIJToUnqS8gZSbQLL9kizJh2aJedMMq
-qgA3vfjt9u/Fa0cEiA5CsIWjtVMBAGhZA+N3x1cAxOwSEQFEfLuEsntgQz2L
-DfVs8bfsciAT+0MNvP+Lsnn/LTLBLboxMqx/VoEPlP6plV0i1hYmli3X+ECh
-E6yigAM3IpckYn1pMhFbmL9wtPfeQyJedEC+LwElFECSRORiM2vLj6JvqVOR
-+wDItEwIphu11IJ8GRNy2T0gOUXoidns4vz02+pUZMKmtdXV1M3xvyeZ7U0M
-wHTVrdgpOpBX57SF6N0BdSry1//sNQVgsFpD6Y5FsNYeG49m/nlPnYr8emAT
-kWGY4Px5DYLAkNc2rIf3Jj5UpyI/VXMkc2wl8mKjvpLjfc0thwVdN5HVLSw9
-ntPnp8e/eDb549Vqz4Rsh/8FfY1NoS/9gVBPKpmIqstPvqr2zjfxL9Ru5qeZ
-IAUkAAAAAElFTkSuQmCC
+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
+QmCC
 ====
 </binary>
 </FictionBook>
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/16x16.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/16x16.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/26x26.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/26x26.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/32x32.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/32x32.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/48x48.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/48x48.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/64x64.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/64x64.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/desktop.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/desktop.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/opensimpad-0.9.0.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/opensimpad-0.9.0.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/openzaurus_240x320.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/openzaurus_240x320.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/openzaurus_640x480.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/openzaurus_640x480.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/pdaxrom.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/pdaxrom.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/pepperpad3.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/pepperpad3.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/pma400.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/pma400.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/qvfb.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/qvfb.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/win32.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/win32.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/zaurus_240x320.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/zaurus_240x320.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/application/zaurus_640x480.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/application/zaurus_640x480.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/22x22-transparent-png/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-orderseries.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/28x28-transparent-png/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/desktop/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/desktop/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-orderseries.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-orderseries.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/maemo/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/maemo/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/moto/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/moto/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/opensimpad-0.9.0/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_240x320/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_240x320/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-orderseries.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-orderseries.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/openzaurus_640x480/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/openzaurus_640x480/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-orderseries.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-orderseries.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pdaxrom/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pdaxrom/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pepperpad3/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pepperpad3/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/pma400/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/pma400/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/qvfb/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/qvfb/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/win32/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/win32/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-order.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-order.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-order-series.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-order-series.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_240x320/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_240x320/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-authorinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-authorinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-bookinfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-bookinfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-download-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-download-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-download-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-download-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-download-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-download-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-local-epub.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-local-epub.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-local-fb2.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-local-fb2.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-local-mobi.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-local-mobi.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-open-in-browser.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-open-in-browser.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-orderseries.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-orderseries.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-removebook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-removebook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-remove.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-remove.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-removetag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-removetag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-strut.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-strut.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/booktree/zaurus_640x480/tree-taginfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/booktree/zaurus_640x480/tree-taginfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/14x15-png/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/14x15-png/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/22x18-png/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/22x18-png/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/addBook.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/addBook.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/advancedSearchOnNetwork.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/bookInfo.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/byAuthor.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/byTag.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/byTag.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/findNext.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/findNext.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/findPrevious.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/gotoHome.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/preferences.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/preferences.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/redo.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/redo.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/rotate.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/rotate.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/search.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/search.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/showHelp.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/showLibrary.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/showNetLibrary.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/showReading.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/showReading.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/showRecent.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/toc.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/toc.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-ico/undo.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-ico/undo.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/32x32-transparent-png/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/32x32-transparent-png/undo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/desktop/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/desktop/undo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/maemo/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/maemo/undo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/moto/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/moto/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/opensimpad-0.9.0/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/opensimpad-0.9.0/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_240x320/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_240x320/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/openzaurus_640x480/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/openzaurus_640x480/undo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pdaxrom/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pdaxrom/undo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pepperpad3/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pepperpad3/undo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/pma400/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/pma400/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/qvfb/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/qvfb/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/addBook.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/addBook.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/advancedSearchOnNetwork.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/advancedSearchOnNetwork.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/bookInfo.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/bookInfo.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/byAuthor.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/byAuthor.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/byTag.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/byTag.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/findNext.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/findNext.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/findPrevious.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/findPrevious.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/gotoHome.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/gotoHome.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/preferences.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/preferences.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/redo.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/redo.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/rotate.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/rotate.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/search.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/search.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/showHelp.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/showHelp.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/showLibrary.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/showLibrary.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/showNetLibrary.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/showNetLibrary.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/showReading.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/showReading.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/showRecent.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/showRecent.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/toc.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/toc.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/win32/undo.ico and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/win32/undo.ico differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_240x320/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_240x320/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/addBook.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/addBook.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/advancedSearchOnNetwork.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/advancedSearchOnNetwork.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/bookInfo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/bookInfo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/byAuthor.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/byAuthor.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/byTag.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/byTag.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/findNext.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/findNext.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/findPrevious.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/findPrevious.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/gotoHome.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/gotoHome.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/preferences.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/preferences.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/redo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/redo.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/rotate.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/rotate.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/search.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/search.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/showHelp.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/showHelp.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/showLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/showLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/showNetLibrary.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/showNetLibrary.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/showReading.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/showReading.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/showRecent.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/showRecent.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/toc.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/toc.png differ
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/icons/toolbar/zaurus_640x480/undo.png and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/icons/toolbar/zaurus_640x480/undo.png differ
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/ar.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/ar.xml
--- fbreader-0.8.17/fbreader/data/resources/ar.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/resources/ar.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,422 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+	<node name="menu">
+		<node name="bookInfo" value="معلومات الكتاب..." />
+		<node name="toc" value="جدول المحتويات" />
+		<node name="library" value="المكتبة">
+			<node name="showLibrary" value="افتح" />
+			<node name="previousBook" value="الكتاب السابق" />
+			<node name="showRecent" value="الأخيرة" />
+			<node name="addBook" value="أضف كتابا..." />
+			<node name="showHelp" value="عن إف.بي.ريدر" />
+		</node>
+		<node name="navigate" value="تصفّح">
+			<node name="gotoHome" value="اذهب إلى بداية المستند" />
+			<node name="gotoPageNumber" value="اذهب إلى صفحة..." />
+			<node name="gotoSectionStart" value="اذهب إلى بداية الجزء النصي" />
+			<node name="gotoSectionEnd" value="اذهب إلى نهاية الجزء النصي" />
+			<node name="nextTOCSection" value="اذهب إلى العنصر التالي في جدول المحتويات" />
+			<node name="previousTOCSection" value="اذهب إلى العنصر السابق في جدول المحتويات" />
+			<node name="undo" value="عد للخلف" />
+			<node name="redo" value="تقدّم للأمام" />
+		</node>
+		<node name="selection" value="التحديد">
+			<node name="copyToClipboard" value="انسخ للحافظة" />
+			<node name="openInDictionary" value="افتح في القاموس" />
+			<node name="clearSelection" value="امسح" />
+		</node>
+		<node name="search" value="بحث">
+			<node name="search" value="ابحث عن نص..." />
+			<node name="findNext" value="ابحث عن التالي" />
+			<node name="findPrevious" value="ابحث عن السابق" />
+		</node>
+		<node name="view" value="عرض">
+			<node name="rotate" value="لف الشاشة" />
+			<node name="toggleFullscreen" value="املأ الشاشة" />
+			<node name="toggleIndicator" value="بدّل الموضّح" />
+		</node>
+		<node name="preferences" value="التفضيلات..." />
+		<node name="quit" value="أغلق" />
+	</node>
+	<node name="toolbar">
+		<node name="showReading" toBeTranslated="true" value="Show Reading Mode" />
+		<node name="showLibrary" value="اعرض شجرة المكتبة">
+			<node name="popup" toBeTranslated="true" value="Show Recent Books List" />
+		</node>
+		<node name="showRecent" value="اعرض قائمة آخر الكتب" />
+		<node name="byAuthor" toBeTranslated="true" value="Organize Books by Author" />
+		<node name="byTag" toBeTranslated="true" value="Organize Books by Tag" />
+		<node name="addBook" value="أضف الملف للمكتبة" />
+		<node name="showNetLibrary" toBeTranslated="true" value="Search in Network Libraries" />
+		<node name="searchOnNetwork" toBeTranslated="true" value="Network Search" />
+		<node name="advancedSearchOnNetwork" toBeTranslated="true" value="Advanced Network Search" />
+		<node name="gotoHome" value="اذهب إلى بداية النص" />
+		<node name="undo" value="عد للخلف" />
+		<node name="redo" value="تقدّم للأمام" />
+		<node name="gotoPageNumberWithParameter" toBeTranslated="true" value="Go to Page" />
+		<node name="toc" value="جدول المحتويات" />
+		<node name="search" value="البحث في النص" />
+		<node name="findNext" value="ابحث عن التالي" />
+		<node name="findPrevious" value="ابحث عن السابق" />
+		<node name="bookInfo" value="اعرض حوار معلومات الكتاب" />
+		<node name="preferences" value="اعرض حوار التفضيلات" />
+		<node name="rotate" value="لف النص" />
+		<node name="showHelp" value="عن إف.بي.ريدر" />
+	</node>
+	<node name="dialog">
+		<node name="button">
+			<node name="go" value="ا&amp;ذهب" />
+			<node name="thisOnly" value="هذا فقط" />
+			<node name="withSubtags" value="مع الوسوم الثانوية" />
+		</node>
+		<node name="OptionsDialog">
+			<node name="title" value="إف.بي.ريدر - الخيارات" />
+			<node name="tab">
+				<node name="Library" value="المكتبة">
+					<node name="bookPath" value="مسار الكتاب" />
+					<node name="lookInSubdirectories" value="ابحث عن الكتب في المجلدات الفرعية" />
+					<node name="collectBooksWithoutMetaInfo" toBeTranslated="true" value="Collect Books without MetaInfo" />
+					<node name="downloadDirectory" toBeTranslated="true" value="Directory for Downloaded Books" />
+					<node name="showAllBooksTag" value="اعرض كل الكتب في الفرع" />
+				</node>
+				<node name="NetworkLibrary" toBeTranslated="true" value="Network Search">
+					<node name="useProxy" toBeTranslated="true" value="Use Proxy" />
+					<node name="proxyHost" toBeTranslated="true" value="Proxy Host" />
+					<node name="proxyPort" toBeTranslated="true" value="Proxy Port" />
+					<node name="timeout" toBeTranslated="true" value="Network Operations Timeout, seconds" />
+				</node>
+				<node name="Language" value="اللغة">
+					<node name="autoDetect" value="تعرّف هلى اللغة والترميز آليا" />
+					<node name="defaultLanguage" value="اللغة الافتراضية" />
+					<node name="defaultEncodingSet" value="طقم الترميز الافتراضي" />
+					<node name="defaultEncoding" value="الترميز الافتراضي" />
+					<node name="useWindows1252Hack" value="استخدم windows-1252 بدلا من iso-8859-1" />
+				</node>
+				<node name="Indicator" value="الموضح">
+					<node name="type" toBeTranslated="true" value="Show as">
+						<node name="osScrollbar" toBeTranslated="true" value="OS Scrollbar" />
+						<node name="fbIndicator" toBeTranslated="true" value="Old Style Indicator" />
+						<node name="none" toBeTranslated="true" value="Don&apos;t Show" />
+					</node>
+					<node name="height" value="ارتفاع الموضح" />
+					<node name="offset" value="بعده من النص" />
+					<node name="pageNumber" value="اعرض الموضع كرقم" />
+					<node name="time" value="اعرض الوقت" />
+					<node name="fontSize" value="حجم" />
+					<node name="tocMarks" value="اعرض علامات جدول المحتويات" />
+					<node name="navigation" value="فعّل التصفّح" />
+				</node>
+				<node name="Scrolling" value="التقليب">
+					<node name="optionsFor" value="خيارات">
+						<node name="large" value="التقليب الكبير" />
+						<node name="small" value="التقليب الصغير" />
+						<node name="mouse" value="التقليب بالفأرة" />
+						<node name="tap" value="التقليب بالأصبع" />
+					</node>
+					<node name="delay" value="التأخير بين كل قلبة، بالملي ثانية" />
+					<node name="mode" value="نمط التقليب">
+						<node name="noOverlapping" value="لا تداخل" />
+						<node name="keepLines" value="حافظ على السطور" />
+						<node name="scrollLines" value="لف السطور" />
+						<node name="scrollPercentage" value="نسبة التقليب" />
+						<node name="disable" value="عطّل" />
+					</node>
+					<node name="linesToKeep" value="السطور التي ستترك" />
+					<node name="linesToScroll" value="السطور التي ستلف" />
+					<node name="percentToScroll" value="نسبة التقليب" />
+					<node name="fingerOnly" value="اقلب عند الطرق بالأصبع فقط" />
+				</node>
+				<node name="Selection" value="التحديد">
+					<node name="enableSelection" value="فعّل تحديد النص" />
+				</node>
+				<node name="CSS" toBeTranslated="true" value="CSS">
+					<node name="overrideSpecifiedFonts" toBeTranslated="true" value="Always Use My Own Fonts" />
+				</node>
+				<node name="Margins" value="الحواشي">
+					<node name="left" value="الحاشية اليسرى" />
+					<node name="right" value="الحاشية اليمنى" />
+					<node name="top" value="الحاشية العليا" />
+					<node name="bottom" value="الحاشية السفلى" />
+				</node>
+				<node name="Format" value="النسق">
+					<node name="optionsFor" value="خيارات" />
+					<node name="lineSpacing" value="تباعد السطور">
+						<node name="unchanged" value="&lt;بلا تغيير&gt;" />
+					</node>
+					<node name="firstLineIndent" value="إزاحة السطر الأول" />
+					<node name="alignment" value="المحاذاة">
+						<node name="left" value="يسار" />
+						<node name="right" value="يمين" />
+						<node name="center" value="وسط" />
+						<node name="justify" value="مساوى" />
+						<node name="unchanged" value="&lt;بلا تغيير&gt;" />
+					</node>
+					<node name="spaceBefore" value="المسافة قبل" />
+					<node name="spaceAfter" value="المسافة بعد" />
+					<node name="startIndent" toBeTranslated="true" value="Line Start Indent" />
+					<node name="endIndent" toBeTranslated="true" value="Line End Indent" />
+				</node>
+				<node name="Styles" value="الطرز">
+					<node name="optionsFor" value="خيارات" />
+					<node name="fontFamily" value="العائلة">
+						<node name="unchanged" value="&lt;بلا تغيير&gt;" />
+					</node>
+					<node name="fontSize" value="الحجم" />
+					<node name="fontSizeDifference" value="اختلافات الحجم" />
+					<node name="bold" value="عريض" />
+					<node name="italic" value="مائل" />
+					<node name="allowHyphenations" value="اسمح بقطع الكلمات في آخر السطر" />
+					<node name="autoHyphenations" value="قطع تلقائي للكلمات" />
+				</node>
+				<node name="Rotation" value="التدوير">
+					<node name="direction" value="نوع التدوير">
+						<node name="disabled" value="معطّل" />
+						<node name="clockwise" value="90 درجة مع عقارب الساعة" />
+						<node name="counterclockwise" value="90 درجة عكس عقارب الساعة" />
+						<node name="180" value="180 درجة" />
+						<node name="cycle" value="بدل بين الأربع اتجاهات" />
+					</node>
+				</node>
+				<node name="Colors" value="الألوان">
+					<node name="colorFor" value="لون">
+						<node name="background" value="الخلفية" />
+						<node name="selectionBackground" value="خلفية التحديد" />
+						<node name="text" value="النص العادي" />
+						<node name="internalLink" value="النص التشعبي الداخلي" />
+						<node name="externalLink" value="النص التشعبي الخارجي" />
+						<node name="bookLink" toBeTranslated="true" value="Link to Another Book" />
+						<node name="highlighted" value="النص المُبرز" />
+						<node name="treeLines" value="خطوط الشجرة" />
+						<node name="indicator" value="مُوضّح الموضع" />
+					</node>
+				</node>
+				<node name="Keys" value="المفاتيح">
+					<node name="grabSystemKeys" value="التقط مفاتيح النظام" />
+					<node name="separate" value="ارتباطات المفاتيح تعتمد على الوضع" />
+					<node name="orientation" value="الوضع" />
+					<node name="action">
+						<node name="none" value="لا شيء" />
+						<node name="showLibrary" value="أظهر المكتبة" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="أظهر الكتب الأخيرة" />
+						<node name="previousBook" value="افتح الكتاب السابق" />
+						<node name="toc" value="أظهر جدول المحتويات" />
+						<node name="gotoHome" value="اذهب إلى المنزل" />
+						<node name="gotoSectionStart" value="اذهب إلى بداية القسم" />
+						<node name="gotoSectionEnd" value="اذهب إلى نهاية القسم" />
+						<node name="nextTOCSection" value="اذهب إلى القسم التالي في جدول المحتويات" />
+						<node name="previousTOCSection" value="Go to Previous TOC Section" />
+						<node name="largeScrollForward" value="Large Scroll Forward" />
+						<node name="largeScrollBackward" value="Large Scroll Backward" />
+						<node name="smallScrollForward" value="Small Scroll Forward" />
+						<node name="smallScrollBackward" value="Small Scroll Backward" />
+						<node name="undo" value="تراجع" />
+						<node name="redo" value="أعد" />
+						<node name="copyToClipboard" value="Copy Selected Text to Clipboard" />
+						<node name="openInDictionary" value="Open Selected Text in Dictionary" />
+						<node name="clearSelection" value="Clear Selection" />
+						<node name="search" value="ابحث" />
+						<node name="findPrevious" value="Find Previous" />
+						<node name="findNext" value="Find Next" />
+						<node name="increaseFont" value="Increase Font Size" />
+						<node name="decreaseFont" value="Decrease Font Size" />
+						<node name="toggleIndicator" value="Toggle Position Indicator" />
+						<node name="toggleFullscreen" value="Toggle Fullscreen Mode" />
+						<node name="rotate" value="Rotate Screen" />
+						<node name="preferences" value="Show Options Dialog" />
+						<node name="bookInfo" value="Show Book Info Dialog" />
+						<node name="addBook" value="أضف كتابا" />
+						<node name="cancel" value="ألغ" />
+						<node name="quit" value="اخرج" />
+					</node>
+					<node name="quitOnCancel" value="Quit Application on Cancel" />
+					<node name="keyDelay" value="Delay Between Accepted Key Pressings" />
+				</node>
+				<node name="Config" value="الإعداد">
+					<node name="autoSave" value="احفظ الحالة تلقائيا" />
+					<node name="timeout" value="الفترة بين الحفظ، بالثواني" />
+				</node>
+				<node name="Dictionary" value="القاموس">
+					<node name="enableIntegration" value="فعّل التكامل %s" />
+					<node name="defaultText" value="فعّل التكامل مع القاموس" />
+					<node name="choice" value="تكامل مع" />
+					<node name="singleClickOpen" value="افتح بنقرة واحدة" />
+				</node>
+				<node name="Web" value="الوب">
+					<node name="enableIntegration" value="افتح الوصلات الخارجية في %s" />
+					<node name="defaultText" value="افتح الوصلات الخارجية في المتصفح" />
+					<node name="choice" value="استخدم المتصفح" />
+					<node name="command" value="الأمر" />
+				</node>
+				<node name="Maemo" value="ميٰمو">
+					<node name="keyActionOnRelease" value="الإجراءات عند ترك المفتاح، لا عند ضغطه" />
+					<node name="minStylusPressure" value="أدنى ضغط من الريشة" />
+					<node name="maxStylusPressure" value="أقصى ضغط من الريشة" />
+				</node>
+			</node>
+		</node>
+		<node name="InfoDialog">
+			<node name="title" value="إف.بي.ريدر - معلومات الكتاب" />
+			<node name="tab">
+				<node name="Common" value="عام">
+					<node name="file" value="الملف" />
+					<node name="title" value="العنوان" />
+					<node name="authorDisplayName" value="المؤلف (اسم العرض)" />
+					<node name="authorSortKey" value="المؤلف (مفتاح الترتيب)" />
+					<node name="language" value="اللغة" />
+					<node name="encodingSet" value="طقم الترميز" />
+					<node name="encoding" value="الترميز" />
+				</node>
+				<node name="Series" value="السلسلة">
+					<node name="seriesTitle" value="عنوان السلسلة" />
+					<node name="bookNumber" value="رقم الكتاب" />
+				</node>
+				<node name="Tags" value="الوسوم">
+					<node name="tags" value="قائمة الوسوم" />
+				</node>
+				<node name="Text" value="النص">
+					<node name="breakType" value="اقطع الفقرات عند" />
+					<node name="ignoreIndent" value="تجاهل الإزاحة الأقل من" />
+					<node name="buildTOC" value="جهز جدول المحتويات" />
+					<node name="emptyLines" value="الأسطر الفارغة قبل الأقسام الجديدة" />
+				</node>
+				<node name="&lt;PRE&gt;" value="&lt;قبل&gt;">
+					<node name="breakType" value="اقطع الفقرات عند" />
+					<node name="ignoreIndent" value="تجاهل الإزاحة الأقل من" />
+					<node name="buildTOC" value="جهز جدول المحتويات" />
+					<node name="emptyLines" value="الأسطر الفارغة قبل الأقسام الجديدة" />
+				</node>
+			</node>
+		</node>
+		<node name="addFileDialog">
+			<node name="title" value="إف.بي.ريدر - أضف كتابا للمكتبة" />
+		</node>
+		<node name="textSearchDialog">
+			<node name="title" value="البحث عن النص" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="&amp;تجاهل حالة الحرف" />
+			<node name="wholeText" value="في &amp;كل النص" />
+			<node name="backward" value="&amp;للخلف" />
+			<node name="currentSection" value="&amp;هذا القسم فقط" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" toBeTranslated="true" value="Network Search" />
+			<node name="bookTitle" toBeTranslated="true" value="Title" />
+			<node name="author" toBeTranslated="true" value="Author" />
+			<node name="category" toBeTranslated="true" value="Category" />
+			<node name="series" toBeTranslated="true" value="Series" />
+			<node name="description" toBeTranslated="true" value="Description" />
+		</node>
+		<node name="gotoPageDialog">
+			<node name="title" value="اذهب إلى صفحة" />
+			<node name="pageNumber" value="اذهب إلى الصفحة رقم" />
+		</node>
+		<node name="editTagInfoDialog">
+			<node name="title" value="حرر/انسخ الوسم" />
+			<node name="editOrClone" value="الإجراء">
+				<node name="edit" value="غير اسم الوسم" />
+				<node name="clone" value="انسخ الوسم" />
+			</node>
+			<node name="name" value="اسم الوسم" />
+			<node name="includeSubtags" value="اشمل الوسوم الفرعيى" />
+		</node>
+		<node name="removeBookBox">
+			<node name="title" value="احذف الكتاب" />
+			<node name="message" value="أأحذف الكتاب &#10;“%s”&#10; من المكتبة؟" />
+		</node>
+		<node name="removeTagBox">
+			<node name="title" value="احذف الوسم" />
+			<node name="message" value="أأحذف الوسم “%s”؟" />
+		</node>
+		<node name="openBookErrorBox">
+			<node name="title" value="خطأ" />
+			<node name="message" value="تعذّر فتح:&#10;%s" />
+		</node>
+		<node name="noHelpBox">
+			<node name="title" value="خطأ" />
+			<node name="message" value="آسف، ملف المساعدة غير موجود" />
+		</node>
+		<node name="tagMustBeNonEmpty">
+			<node name="title" value="خطأ" />
+			<node name="message" value="يجب ألا يكون اسم الوسم خاليا" />
+		</node>
+		<node name="tagMustNotContainComma">
+			<node name="title" value="خطأ" />
+			<node name="message" value="يجب ألا يحتوي اسم الوسم على العلامة “,”" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" toBeTranslated="true" value="Empty libraries list" />
+		</node>
+		<node name="downloadError">
+			<node name="title" toBeTranslated="true" value="Error while downloading" />
+			<node name="message" toBeTranslated="true" value="Can&apos;t download this book at the moment" />
+		</node>
+		<node name="waitMessage">
+			<node name="loadingBook" value="يجري تحميل الكتاب، انتظر رجاء..." />
+			<node name="loadingBookList" value="يجري تحميل قائمة الكتب، انتظر رجاء..." />
+			<node name="migrate" value="يجري الترقية لإصدارة جديدة، انتظر رجاء..." />
+			<node name="downloadBookList" toBeTranslated="true" value="Downloading book list. Please, wait..." />
+			<node name="downloadBook" toBeTranslated="true" value="Downloading book. Please, wait..." />
+		</node>
+	</node>
+	<node name="style">
+		<node name="Base" value="القاعدة" />
+		<node name="Regular Paragraph" value="الفقرات العادية" />
+		<node name="Title" value="العناوين" />
+		<node name="Section Title" value="عناوين الأقسام" />
+		<node name="Poem Title" value="عناوين الشعر" />
+		<node name="Subtitle" value="العناوين الفرعية" />
+		<node name="Annotation" value="Annotation" />
+		<node name="Epigraph" value="Epigraph" />
+		<node name="Stanza" value="الأبيات" />
+		<node name="Verse" value="الآيات" />
+		<node name="Preformatted text" value="النص المنسق مسبقا" />
+		<node name="Image" value="الصور" />
+		<node name="Cite" value="الاقتباس" />
+		<node name="Author" value="المؤلف" />
+		<node name="Date" value="التاريخ" />
+		<node name="Internal Hyperlink" value="الوصلات الداخلية" />
+		<node name="Footnote" value="التذييل" />
+		<node name="Emphasis" value="التركيز" />
+		<node name="Strong" value="المهم" />
+		<node name="Subscript" value="النص السفلي" />
+		<node name="Superscript" value="النص العلوي" />
+		<node name="Code" value="الكود" />
+		<node name="StrikeThrough" value="الشطب" />
+		<node name="Contents Table" value="جدول المحتويات" />
+		<node name="Library Entry" toBeTranslated="true" value="Library Entry" />
+		<node name="Recent Book List" value="قائمة الكتب الأخيرة" />
+		<node name="Italic" value="مائل" />
+		<node name="Bold" value="عريض" />
+		<node name="Definition" value="تعريف" />
+		<node name="Definition Description" value="شرح التعريف" />
+		<node name="Header 1" value="رأس 1" />
+		<node name="Header 2" value="رأس 2" />
+		<node name="Header 3" value="رأس 3" />
+		<node name="Header 4" value="رأس 4" />
+		<node name="Header 5" value="رأس 5" />
+		<node name="Header 6" value="رأس 6" />
+		<node name="External Hyperlink" value="الوصلات الخارجية" />
+		<node name="Link to Another Book" toBeTranslated="true" value="Link to Another Book" />
+	</node>
+	<node name="external">
+		<node name="browser" value="المتصفح" />
+		<node name="defaultBrowser" value="المتصفح الافتراضي" />
+	</node>
+	<node name="mobipocketPlugin">
+		<node name="unknown" value="خطأ غير معروف" />
+		<node name="unsupportedCompressionMethod" value="طريقة ضغط غير مدعومة" />
+		<node name="encriptedFile" value="ملف محمي الحقوق رقميا (DRM)" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" toBeTranslated="true" value="Network Library" />
+		<node name="startText" toBeTranslated="true" value="Please enter a search pattern in the text field on the toolbar and press &lt;Return&gt;." />
+		<node name="notFound" toBeTranslated="true" value="Sorry, no suitable books were found." />
+	</node>
+	<node name="library">
+		<node name="caption" value="المكتبة" />
+		<node name="allBooks" value="كل الكتب" />
+		<node name="booksWithoutTags" value="كتب غير موسومة" />
+		<node name="noBooks" value="لم يجد إف.بي.ريدر أي كتب في الأماكن المحددة. من فضلك حدد مسار كتبك في جوار التفضيلات (لسان ”المكتبة“، خانة ”مسار الكتب“). أو يمكنك إضافة كتب إلى مكتبتك باستخدام رز ”أضف كتب“." />
+	</node>
+</resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/cs.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/cs.xml
--- fbreader-0.8.17/fbreader/data/resources/cs.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/data/resources/cs.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Czech FBReader resources, by Lubomír Čevela -->
+<resources>
+	<node name="menu">
+		<node name="bookInfo" value="Informace o knize..." />
+		<node name="toc" value="Obsah" />
+		<node name="library" value="Knihovna">
+			<node name="showLibrary" value="Otevřít" />
+			<node name="previousBook" value="Předchozí kniha" />
+			<node name="showRecent" value="Nedávné" />
+			<node name="addBook" value="Přidat knihu..." />
+			<node name="showHelp" value="O FBReader" />
+		</node>
+		<node name="navigate" value="Navigovat">
+			<node name="gotoHome" value="Na začátek dokumentu" />
+			<node name="gotoPageNumber" value="Na stránku..." />
+			<node name="gotoSectionStart" value="Na začátek oddílu" />
+			<node name="gotoSectionEnd" value="Na konec oddílu" />
+			<node name="nextTOCSection" value="Na další položku obsahu" />
+			<node name="previousTOCSection" value="Na předchozí položku obsahu" />
+			<node name="undo" value="Zpět" />
+			<node name="redo" value="Dopředu" />
+		</node>
+		<node name="selection" value="Vybrat">
+			<node name="copyToClipboard" value="Kopírovat" />
+			<node name="openInDictionary" value="Otevřít ve slovníku" />
+			<node name="clearSelection" value="Vyčistit výběr" />
+		</node>
+		<node name="search" value="Najít">
+			<node name="search" value="Najít text..." />
+			<node name="findNext" value="Najít další" />
+			<node name="findPrevious" value="Najít předchozí" />
+		</node>
+		<node name="view" value="Zobrazit">
+			<node name="rotate" value="Otočit obrazovku" />
+			<node name="toggleFullscreen" value="Celá obrazovka" />
+			<node name="toggleIndicator" value="Natočení obrazovky" />
+		</node>
+		<node name="preferences" value="Předvolby..." />
+		<node name="quit" value="Ukončit" />
+	</node>
+	<node name="toolbar">
+		<node name="showReading" value="Čtecí režim" />
+		<node name="showLibrary" value="Knihovna - stromový pohled">
+			<node name="popup" value="Nedávno otevřené knihy" />
+		</node>
+		<node name="showRecent" value="Seznam nedávno otevřených knih" />
+		<node name="byAuthor" value="Seřadit knihy dle autorů" />
+		<node name="byTag" value="Seřadit knihy dle klíčových slov" />
+		<node name="addBook" value="Vložit do knihovny" />
+		<node name="showNetLibrary" value="Hledat v knihovně na síti" />
+		<node name="searchOnNetwork" value="Hledat na síti" />
+		<node name="advancedSearchOnNetwork" value="Rozšířené hledání na síti" />
+		<node name="gotoHome" value="Návrat na začátek textu" />
+		<node name="undo" value="Zpět" />
+		<node name="redo" value="Znovu" />
+		<node name="gotoPageNumberWithParameter" value="Přejít na stránku" />
+		<node name="toc" value="Obsah" />
+		<node name="search" value="Hledat text" />
+		<node name="findNext" value="Najít další" />
+		<node name="findPrevious" value="Najít předchozí" />
+		<node name="bookInfo" value="Informace o knize" />
+		<node name="preferences" value="Nastavení" />
+		<node name="rotate" value="Změna směru textu" />
+		<node name="showHelp" value="O programu FBReader" />
+	</node>
+	<node name="dialog">
+		<node name="button">
+			<node name="go" value="&amp;Provést" />
+			<node name="thisOnly" value="Pouze tento" />
+			<node name="withSubtags" value="S rozšířenými volbami" />
+		</node>
+		<node name="OptionsDialog">
+			<node name="title" value="FBReader - Nastavení" />
+			<node name="tab">
+				<node name="Library" value="Knihovna">
+					<node name="bookPath" value="Složka s knihami" />
+					<node name="lookInSubdirectories" value="Knihy v podadresáři" />
+					<node name="collectBooksWithoutMetaInfo" value="Shromáždit knihy bez meta informací" />
+					<node name="downloadDirectory" value="Prohledávat podadresáře" />
+					<node name="showAllBooksTag" value="Hierarchicky seřazený seznam knih" />
+				</node>
+				<node name="NetworkLibrary" value="Hledání knih na síti">
+					<node name="useProxy" value="Použít Proxy" />
+					<node name="proxyHost" value="Proxy server" />
+					<node name="proxyPort" value="Port Proxy serveru" />
+					<node name="timeout" value="Vypršení časového intervalu sítě v sekundách" />
+				</node>
+				<node name="Language" value="Jazyk">
+					<node name="autoDetect" value="Automatická detekce jazyka o kódování znaků" />
+					<node name="defaultLanguage" value="Předvolený jazyk" />
+					<node name="defaultEncodingSet" value="Předvolená sada kódování" />
+					<node name="defaultEncoding" value="Základní kódování" />
+					<node name="useWindows1252Hack" value="Použít windows-1252 namísto iso-8859-1" />
+				</node>
+				<node name="Indicator" value="Indikátor">
+					<node name="type" value="Zobraz jako">
+						<node name="osScrollbar" value="Posuvník OS" />
+						<node name="fbIndicator" value="Indikátor ve starém stylu" />
+						<node name="none" value="Nezobrazovat" />
+					</node>
+					<node name="height" value="Výška indikátoru" />
+					<node name="offset" value="Vzdálenost od textu" />
+					<node name="pageNumber" value="Zobrazit polohu číselně" />
+					<node name="time" value="Zobrazit čas" />
+					<node name="fontSize" value="Velikost písma" />
+					<node name="tocMarks" value="Zobraz značky TOC" />
+					<node name="navigation" value="Povolit navigaci" />
+				</node>
+				<node name="Scrolling" value="Posuv textu">
+					<node name="optionsFor" value="Nastavení">
+						<node name="large" value="Velký posuv" />
+						<node name="small" value="Malý posuv" />
+						<node name="mouse" value="Posuv pomocí myši" />
+						<node name="tap" value="Posuv dotykovým displejem" />
+					</node>
+					<node name="delay" value="Prodleva posuvu, msec" />
+					<node name="mode" value="Mód posuvu">
+						<node name="noOverlapping" value="Bez překrývaní" />
+						<node name="keepLines" value="Překrýt řádky" />
+						<node name="scrollLines" value="Posuv po řádcích" />
+						<node name="scrollPercentage" value="Posuv po procentech" />
+						<node name="disable" value="Vypnout" />
+					</node>
+					<node name="linesToKeep" value="Počet linek k překrytí" />
+					<node name="linesToScroll" value="Počet linek posuvu" />
+					<node name="percentToScroll" value="Posuv v procentech" />
+					<node name="fingerOnly" value="Posuv pouze dotykem prstu" />
+				</node>
+				<node name="Selection" value="Výběr">
+					<node name="enableSelection" value="Povolit výběr textu" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Vždy použít uživatelské fonty" />
+				</node>
+				<node name="Margins" value="Okraje">
+					<node name="left" value="Levý okraj" />
+					<node name="right" value="Pravý okraj" />
+					<node name="top" value="Horní okraj" />
+					<node name="bottom" value="Dolní okraj" />
+				</node>
+				<node name="Format" value="Formát">
+					<node name="optionsFor" value="Nastavení formátu" />
+					<node name="lineSpacing" value="Řádkování">
+						<node name="unchanged" value="&lt;beze změn&gt;" />
+					</node>
+					<node name="firstLineIndent" value="Odsazení první linky" />
+					<node name="alignment" value="Zarovnání">
+						<node name="left" value="Vlevo" />
+						<node name="right" value="Vpravo" />
+						<node name="center" value="Na střed" />
+						<node name="justify" value="Do bloku" />
+						<node name="unchanged" value="&lt;beze změn&gt;" />
+					</node>
+					<node name="spaceBefore" value="Odsazení před" />
+					<node name="spaceAfter" value="Odsazení za" />
+					<node name="startIndent" value="Počátek odsazení" />
+					<node name="endIndent" value="Konec odsazení" />
+				</node>
+				<node name="Styles" value="Styly">
+					<node name="optionsFor" value="Nastavení stylů" />
+					<node name="fontFamily" value="Rodina fontů">
+						<node name="unchanged" value="&lt;beze změn&gt;" />
+					</node>
+					<node name="fontSize" value="Velikost" />
+					<node name="fontSizeDifference" value="Rozdíl velikosti" />
+					<node name="bold" value="Tučně" />
+					<node name="italic" value="Kurzíva" />
+					<node name="allowHyphenations" value="Povolit dělení slov" />
+					<node name="autoHyphenations" value="Automatické dělení slov" />
+				</node>
+				<node name="Rotation" value="Natočení">
+					<node name="direction" value="Směr natočení">
+						<node name="disabled" value="Vypnuto" />
+						<node name="clockwise" value="90 stupňů ve směru hodinových ručiček" />
+						<node name="counterclockwise" value="90 stupňů proti směru hodinových ručiček" />
+						<node name="180" value="180 stupňů" />
+						<node name="cycle" value="Střídat všechny čtyři směry" />
+					</node>
+				</node>
+				<node name="Colors" value="Barvy">
+					<node name="colorFor" value="Barva">
+						<node name="background" value="Pozadí" />
+						<node name="selectionBackground" value="Výběr pozadí" />
+						<node name="text" value="Běžného textu" />
+						<node name="internalLink" value="Interního hypertextového odkazu" />
+						<node name="externalLink" value="Externího hypertextového odkazu" />
+						<node name="bookLink" value="Odkazu na jinou knihu" />
+						<node name="highlighted" value="Zvýrazněného textu" />
+						<node name="treeLines" value="Stromu" />
+						<node name="indicator" value="Indikátoru" />
+					</node>
+				</node>
+				<node name="Keys" value="Klávesové zkratky">
+					<node name="grabSystemKeys" value="Převzít systémové zkratky" />
+					<node name="separate" value="Vlastní zkratky zavislé na orientaci textu" />
+					<node name="orientation" value="Orientace" />
+					<node name="action">
+						<node name="none" value="Žádné" />
+						<node name="showLibrary" value="Zobrazit knihovnu" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="Zobrazit nedávné" />
+						<node name="previousBook" value="Otevřít předchozí knihu" />
+						<node name="toc" value="Zobrazit obsah" />
+						<node name="gotoHome" value="Přejít na začátek textu" />
+						<node name="gotoSectionStart" value="Přejít na začátek oddílu" />
+						<node name="gotoSectionEnd" value="Přejít na konec oddílu" />
+						<node name="nextTOCSection" value="Přejít na následující záhlaví" />
+						<node name="previousTOCSection" value="Přejít na předchozí záhlaví" />
+						<node name="largeScrollForward" value="Posun vpřed - velký krok" />
+						<node name="largeScrollBackward" value="Posun vzad - velký krok" />
+						<node name="smallScrollForward" value="Posun vpřed - malý krok" />
+						<node name="smallScrollBackward" value="Posun vzad - malý krok" />
+						<node name="undo" value="Zpět" />
+						<node name="redo" value="Znovu" />
+						<node name="copyToClipboard" value="Kopírovat text do schránky" />
+						<node name="openInDictionary" value="Otevřít vybraný text ve slovníku" />
+						<node name="clearSelection" value="Vyčistit výběr" />
+						<node name="search" value="Hledat" />
+						<node name="findPrevious" value="Najít předchozí" />
+						<node name="findNext" value="Najít další" />
+						<node name="increaseFont" value="Zvětšit písmo" />
+						<node name="decreaseFont" value="Zmenšit písmo" />
+						<node name="toggleIndicator" value="Zobrazit indikátor" />
+						<node name="toggleFullscreen" value="Celoobrazovkový mód" />
+						<node name="rotate" value="Směr textu" />
+						<node name="preferences" value="Dialog nastavení" />
+						<node name="bookInfo" value="Informace o knize" />
+						<node name="addBook" value="Přidat knihu" />
+						<node name="cancel" value="Zrušit" />
+						<node name="quit" value="Ukončit" />
+					</node>
+					<node name="quitOnCancel" value="Ukončit program" />
+					<node name="keyDelay" value="Zpoždění stisku kláves" />
+				</node>
+				<node name="Config" value="Nastavení">
+					<node name="autoSave" value="Automatické uložení" />
+					<node name="timeout" value="Interval mezi uloženími v sekundách" />
+				</node>
+				<node name="Dictionary" value="Slovník">
+					<node name="enableIntegration" value="Zapnout integraci s %s" />
+					<node name="defaultText" value="Zapnout integraci se slovníkem" />
+					<node name="choice" value="Integrace s" />
+					<node name="singleClickOpen" value="Otevřít jedním kliknutím" />
+				</node>
+				<node name="Web" value="Web">
+					<node name="enableIntegration" value="Otevírat externí odkazy v %s" />
+					<node name="defaultText" value="Otevírat externí odkazy v prohlížeči" />
+					<node name="choice" value="Použít prohlížeč" />
+					<node name="command" value="Vložte příkaz" />
+				</node>
+				<node name="Maemo" value="Maemo">
+					<node name="keyActionOnRelease" value="Reagovat na puštění klávesy místo stisku klávesy" />
+					<node name="minStylusPressure" value="Minimální tlak stylusu" />
+					<node name="maxStylusPressure" value="Maximální tlak stylusu" />
+				</node>
+			</node>
+		</node>
+		<node name="InfoDialog">
+			<node name="title" value="FBReader - Informace o knize" />
+			<node name="tab">
+				<node name="Common" value="Základní informace">
+					<node name="file" value="Soubor" />
+					<node name="title" value="Název" />
+					<node name="authorDisplayName" value="Jméno autora (Zobrazené)" />
+					<node name="authorSortKey" value="Jméno autora (Třidicí klíč)" />
+					<node name="language" value="Jazyk" />
+					<node name="encodingSet" value="Typ znakové sady" />
+					<node name="encoding" value="Kódování" />
+				</node>
+				<node name="Series" value="Série">
+					<node name="seriesTitle" value="Název série" />
+					<node name="bookNumber" value="Číslo knihy" />
+				</node>
+				<node name="Tags" value="Kategorie">
+					<node name="tags" value="Seznam kategorií" />
+				</node>
+				<node name="Text" value="Text">
+					<node name="breakType" value="Nový odstavec po" />
+					<node name="ignoreIndent" value="Ignorovat rozestup menší než" />
+					<node name="buildTOC" value="Vytvořit hlavičku" />
+					<node name="emptyLines" value="Vyčistit řádky před novou sekcí" />
+				</node>
+				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
+					<node name="breakType" value="Nový odstavec po" />
+					<node name="ignoreIndent" value="Ignorovat rozestup menší než" />
+					<node name="buildTOC" value="Sestavit hlavičku" />
+					<node name="emptyLines" value="Vyčistit řádky před novou sekcí" />
+				</node>
+			</node>
+		</node>
+		<node name="addFileDialog">
+			<node name="title" value="FBReader - Přidat knihu do knihovny" />
+		</node>
+		<node name="textSearchDialog">
+			<node name="title" value="Hledat text" />
+			<node name="text" value="Text" />
+			<node name="ignoreCase" value="&amp;Ignorovat registr knih" />
+			<node name="wholeText" value="&amp;V celém textu" />
+			<node name="backward" value="&amp;Zpět" />
+			<node name="currentSection" value="&amp;Pouze tento oddíl" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Síťové hledání" />
+			<node name="bookTitle" value="Název knihy" />
+			<node name="author" value="Autor" />
+			<node name="category" value="Kategorie" />
+			<node name="series" value="Série" />
+			<node name="description" value="Popis" />
+		</node>
+		<node name="gotoPageDialog">
+			<node name="title" value="Jít na stránku" />
+			<node name="pageNumber" value="Jít na stránku číslo" />
+		</node>
+		<node name="editTagInfoDialog">
+			<node name="title" value="Editovat / kopírovat kategorii" />
+			<node name="editOrClone" value="Provést">
+				<node name="edit" value="Editovat" />
+				<node name="clone" value="Kopírovat" />
+			</node>
+			<node name="name" value="Jméno" />
+			<node name="includeSubtags" value="Včetně podkategorií" />
+		</node>
+		<node name="removeBookBox">
+			<node name="title" value="Odstranit knihu" />
+			<node name="message" value="Odstranit knihu &#10;“%s”&#10; u knihovny?" />
+		</node>
+		<node name="removeTagBox">
+			<node name="title" value="Odstranit kategorii" />
+			<node name="message" value="Odstranit kategorii “%s”?" />
+		</node>
+		<node name="openBookErrorBox">
+			<node name="title" value="Chyba" />
+			<node name="message" value="Nemohu&apos;t otevřít:&#10;%s" />
+		</node>
+		<node name="noHelpBox">
+			<node name="title" value="Chyba" />
+			<node name="message" value="Omlouváme se, soubor nápovědy nenalezen" />
+		</node>
+		<node name="tagMustBeNonEmpty">
+			<node name="title" value="Chyba" />
+			<node name="message" value="Jméno kategorie nesmí být prázdné" />
+		</node>
+		<node name="tagMustNotContainComma">
+			<node name="title" value="Chyba" />
+			<node name="message" value="Jméno kategorie neobsahuje “,” znak" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Vyprázdnit seznam knihovny" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Chyba při stahování" />
+			<node name="message" value="Knihu teď není možné stáhnout" />
+		</node>
+		<node name="waitMessage">
+			<node name="loadingBook" value="Zavádím knihu. Čekejte prosím..." />
+			<node name="loadingBookList" value="Zavádím seznam kniha. Čekejte prosím..." />
+			<node name="migrate" value="Probihá upgrade na novou verzi. Čekejte prosím..." />
+			<node name="downloadBookList" value="Probíhá stahování seznamu knih. Čekejte prosím..." />
+			<node name="downloadBook" value="Stahování knihy. Čekejte prosím..." />
+		</node>
+	</node>
+	<node name="style">
+		<node name="Base" value="Výchozí text" />
+		<node name="Regular Paragraph" value="Běžný odstavec" />
+		<node name="Title" value="Název" />
+		<node name="Section Title" value="Název sekce" />
+		<node name="Poem Title" value="Název básně" />
+		<node name="Subtitle" value="Podtitul" />
+		<node name="Annotation" value="Anotace" />
+		<node name="Epigraph" value="Motto" />
+		<node name="Stanza" value="Sloka" />
+		<node name="Verse" value="Verš" />
+		<node name="Preformatted text" value="Předformátovaný text" />
+		<node name="Image" value="Obrázek" />
+		<node name="Cite" value="Citát" />
+		<node name="Author" value="Autor" />
+		<node name="Date" value="Datum" />
+		<node name="Internal Hyperlink" value="Interní hypertextový odkaz" />
+		<node name="Footnote" value="Poznámka pod čarou" />
+		<node name="Emphasis" value="Zdůraznění" />
+		<node name="Strong" value="Tučně" />
+		<node name="Subscript" value="Index" />
+		<node name="Superscript" value="Horní index" />
+		<node name="Code" value="Programový kód" />
+		<node name="StrikeThrough" value="Přeškrtnuté" />
+		<node name="Contents Table" value="Obsah tabulky" />
+		<node name="Library Entry" value="Záznam do knihovny" />
+		<node name="Recent Book List" value="Seznam nedávných knih" />
+		<node name="Italic" value="Kurzíva" />
+		<node name="Bold" value="Tučně" />
+		<node name="Definition" value="Popis" />
+		<node name="Definition Description" value="Popis definice" />
+		<node name="Header 1" value="Hlavička 1" />
+		<node name="Header 2" value="Hlavička 2" />
+		<node name="Header 3" value="Hlavička 3" />
+		<node name="Header 4" value="Hlavička 4" />
+		<node name="Header 5" value="Hlavička 5" />
+		<node name="Header 6" value="Hlavička 6" />
+		<node name="External Hyperlink" value="Externí hypertextový odkaz" />
+		<node name="Link to Another Book" value="Odkaz na jinou knihu" />
+	</node>
+	<node name="external">
+		<node name="browser" value="Prohlížeč" />
+		<node name="defaultBrowser" value="Základní prohlížeč" />
+	</node>
+	<node name="mobipocketPlugin">
+		<node name="unknown" value="Neznámá chyba" />
+		<node name="unsupportedCompressionMethod" value="Nepodporovaná metoda komprese" />
+		<node name="encriptedFile" value="Soubor chráněný DRM" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Síťová knihovna" />
+		<node name="startText" value="Prosím za dejte hledaný řetězec a stiskněte &lt;Return&gt;." />
+		<node name="notFound" value="Bohužel, žádné vhodné knihy nebyly nalezeny." />
+	</node>
+	<node name="library">
+		<node name="caption" value="Knihovna" />
+		<node name="allBooks" value="Všechny knihy" />
+		<node name="booksWithoutTags" value="Knihy bez kategorizace" />
+		<node name="noBooks" value="FBReader nenalezl vhodné knihy v zadané lokaci. Prosím, specifikujte cestu ke knihám v nastavení programu (“Knihovna” záložka, “ Složka s knihami”). Alternativně, můžete přidat knihu do knihovnny pomocí tlačítka “Přidat knihu”." />
+	</node>
+</resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/en.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/en.xml
--- fbreader-0.8.17/fbreader/data/resources/en.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/en.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,422 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Book Info..."/>
-	  <node name="toc" value="Table of Contents"/>
+	<node name="menu">
+		<node name="bookInfo" value="Book Info..." />
+		<node name="toc" value="Table of Contents" />
 		<node name="library" value="Library">
-			<node name="showLibrary" value="Open"/>
-			<node name="previousBook" value="Previous Book"/>
-			<node name="showRecent" value="Recent"/>
-			<node name="addBook" value="Add Book..."/>
-			<node name="showHelp" value="About FBReader"/>
+			<node name="showLibrary" value="Open" />
+			<node name="previousBook" value="Previous Book" />
+			<node name="showRecent" value="Recent" />
+			<node name="addBook" value="Add Book..." />
+			<node name="showHelp" value="About FBReader" />
 		</node>
 		<node name="navigate" value="Navigate">
-			<node name="gotoHome" value="Go to Start of Document"/>
-			<node name="gotoPageNumber" value="Go to Page..."/>
-			<node name="gotoSectionStart" value="Go to Start of Text Section"/>
-			<node name="gotoSectionEnd" value="Go to End of Text Section"/>
-			<node name="nextTOCSection" value="Go to Next TOC Item"/>
-			<node name="previousTOCSection" value="Go to Previous TOC Item"/>
-			<node name="undo" value="Go Back"/>
-			<node name="redo" value="Go Forward"/>
+			<node name="gotoHome" value="Go to Start of Document" />
+			<node name="gotoPageNumber" value="Go to Page..." />
+			<node name="gotoSectionStart" value="Go to Start of Text Section" />
+			<node name="gotoSectionEnd" value="Go to End of Text Section" />
+			<node name="nextTOCSection" value="Go to Next TOC Item" />
+			<node name="previousTOCSection" value="Go to Previous TOC Item" />
+			<node name="undo" value="Go Back" />
+			<node name="redo" value="Go Forward" />
 		</node>
 		<node name="selection" value="Selection">
-			<node name="copyToClipboard" value="Copy to Clipboard"/>
-			<node name="openInDictionary" value="Open in Dictionary"/>
-			<node name="clearSelection" value="Clear"/>
+			<node name="copyToClipboard" value="Copy to Clipboard" />
+			<node name="openInDictionary" value="Open in Dictionary" />
+			<node name="clearSelection" value="Clear" />
 		</node>
 		<node name="search" value="Find">
-			<node name="search" value="Find Text..."/>
-			<node name="findNext" value="Find Next"/>
-			<node name="findPrevious" value="Find Previous"/>
+			<node name="search" value="Find Text..." />
+			<node name="findNext" value="Find Next" />
+			<node name="findPrevious" value="Find Previous" />
 		</node>
 		<node name="view" value="View">
-			<node name="rotate" value="Rotate Screen"/>
-			<node name="toggleFullscreen" value="Full Screen"/>
-			<node name="toggleIndicator" value="Toggle Indicator"/>
+			<node name="rotate" value="Rotate Screen" />
+			<node name="toggleFullscreen" value="Full Screen" />
+			<node name="toggleIndicator" value="Toggle Indicator" />
 		</node>
-		<node name="preferences" value="Preferences..."/>
-		<node name="quit" value="Close"/>
+		<node name="preferences" value="Preferences..." />
+		<node name="quit" value="Close" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Show Library Tree"/>
-		<node name="showRecent" value="Show Recent Books List"/>
-		<node name="addBook" value="Add File to Library"/>
-		<node name="gotoHome" value="Go to Start of Text"/>
-		<node name="undo" value="Go Back"/>
-		<node name="redo" value="Go Forward"/>
-		<node name="toc" value="Table of Contents"/>
-		<node name="search" value="Text Search"/>
-		<node name="findNext" value="Find Next"/>
-		<node name="findPrevious" value="Find Previous"/>
-		<node name="bookInfo" value="Show Book Info Dialog"/>
-		<node name="preferences" value="Show Preferences Dialog"/>
-		<node name="rotate" value="Rotate Text"/>
-		<node name="showHelp" value="About FBReader"/>
+		<node name="showReading" value="Show Reading Mode" />
+		<node name="showLibrary" value="Show Library Tree">
+			<node name="popup" value="Show Recent Books List" />
+		</node>
+		<node name="showRecent" value="Show Recent Books List" />
+		<node name="byAuthor" value="Organize Books by Author" />
+		<node name="byTag" value="Organize Books by Tag" />
+		<node name="addBook" value="Add File to Library" />
+		<node name="showNetLibrary" value="Search in Network Libraries" />
+		<node name="searchOnNetwork" value="Network Search" />
+		<node name="advancedSearchOnNetwork" value="Advanced Network Search" />
+		<node name="gotoHome" value="Go to Start of Text" />
+		<node name="undo" value="Go Back" />
+		<node name="redo" value="Go Forward" />
+		<node name="gotoPageNumberWithParameter" value="Go to Page" />
+		<node name="toc" value="Table of Contents" />
+		<node name="search" value="Text Search" />
+		<node name="findNext" value="Find Next" />
+		<node name="findPrevious" value="Find Previous" />
+		<node name="bookInfo" value="Show Book Info Dialog" />
+		<node name="preferences" value="Show Preferences Dialog" />
+		<node name="rotate" value="Rotate Text" />
+		<node name="showHelp" value="About FBReader" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Go!"/>
-			<node name="thisOnly" value="This only"/>
-			<node name="withSubtags" value="With subtags"/>
+			<node name="go" value="&amp;Go!" />
+			<node name="thisOnly" value="This only" />
+			<node name="withSubtags" value="With subtags" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Options"/>
+			<node name="title" value="FBReader - Options" />
 			<node name="tab">
 				<node name="Library" value="Library">
-					<node name="bookPath" value="Book Path"/>
-					<node name="lookInSubdirectories" value="Look for Books in Subdirectories"/>
-					<node name="recentListSize" value="Recent Books List Size"/>
-					<node name="showTags" value="Show Tag Hierarchies"/>
-					<node name="showAllBooksList" value="Show All Books Branch"/>
+					<node name="bookPath" value="Book Path" />
+					<node name="lookInSubdirectories" value="Look for Books in Subdirectories" />
+					<node name="collectBooksWithoutMetaInfo" value="Collect Books without MetaInfo" />
+					<node name="downloadDirectory" value="Directory for Downloaded Books" />
+					<node name="showAllBooksTag" value="All Books Branch in Book Tree" />
+				</node>
+				<node name="NetworkLibrary" value="Network Search">
+					<node name="useProxy" value="Use Proxy" />
+					<node name="proxyHost" value="Proxy Host" />
+					<node name="proxyPort" value="Proxy Port" />
+					<node name="timeout" value="Network Operations Timeout, seconds" />
 				</node>
 				<node name="Language" value="Language">
-					<node name="autoDetect" value="Automatically Detect Language and Encoding"/>
-					<node name="defaultLanguage" value="Default Language"/>
-					<node name="defaultEncodingSet" value="Default Encoding Set"/>
-					<node name="defaultEncoding" value="Default Encoding"/>
-					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1"/>
+					<node name="autoDetect" value="Automatically Detect Language and Encoding" />
+					<node name="defaultLanguage" value="Default Language" />
+					<node name="defaultEncodingSet" value="Default Encoding Set" />
+					<node name="defaultEncoding" value="Default Encoding" />
+					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Indicator">
-					<node name="show" value="Show Position Indicator"/>
-					<node name="height" value="Indicator Height"/>
-					<node name="offset" value="Offset from Text"/>
-					<node name="pageNumber" value="Show Position as Numbers"/>
-					<node name="time" value="Show Time"/>
-					<node name="fontSize" value="Font Size"/>
-					<node name="tocMarks" value="Show TOC Marks"/>
-					<node name="navigation" value="Enable Navigation"/>
+					<node name="type" value="Show as">
+						<node name="osScrollbar" value="OS Scrollbar" />
+						<node name="fbIndicator" value="Old Style Indicator" />
+						<node name="none" value="Don&apos;t Show" />
+					</node>
+					<node name="height" value="Indicator Height" />
+					<node name="offset" value="Offset from Text" />
+					<node name="pageNumber" value="Show Position as Numbers" />
+					<node name="time" value="Show Time" />
+					<node name="fontSize" value="Font Size" />
+					<node name="tocMarks" value="Show TOC Marks" />
+					<node name="navigation" value="Enable Navigation" />
 				</node>
 				<node name="Scrolling" value="Scrolling">
 					<node name="optionsFor" value="Options for">
-						<node name="large" value="Large Scrollings"/>
-						<node name="small" value="Small Scrollings"/>
-						<node name="mouse" value="Mouse Scrollings"/>
-						<node name="tap" value="Tap Scrollings"/>
+						<node name="large" value="Large Scrollings" />
+						<node name="small" value="Small Scrollings" />
+						<node name="mouse" value="Mouse Scrollings" />
+						<node name="tap" value="Tap Scrollings" />
 					</node>
-					<node name="delay" value="Delay between Scrollings, msecs"/>
+					<node name="delay" value="Delay between Scrollings, msecs" />
 					<node name="mode" value="Scrolling Mode">
-						<node name="noOverlapping" value="No Overlapping"/>
-						<node name="keepLines" value="Keep Lines"/>
-						<node name="scrollLines" value="Scroll Lines"/>
-						<node name="scrollPercentage" value="Scroll Percentage"/>
-						<node name="disable" value="Disable"/>
+						<node name="noOverlapping" value="No Overlapping" />
+						<node name="keepLines" value="Keep Lines" />
+						<node name="scrollLines" value="Scroll Lines" />
+						<node name="scrollPercentage" value="Scroll Percentage" />
+						<node name="disable" value="Disable" />
 					</node>
-					<node name="linesToKeep" value="Lines to Keep"/>
-					<node name="linesToScroll" value="Lines to Scroll"/>
-					<node name="percentToScroll" value="Percent to Scroll"/>
-					<node name="fingerOnly" value="Scroll on Finger Tap Only"/>
+					<node name="linesToKeep" value="Lines to Keep" />
+					<node name="linesToScroll" value="Lines to Scroll" />
+					<node name="percentToScroll" value="Percent to Scroll" />
+					<node name="fingerOnly" value="Scroll on Finger Tap Only" />
 				</node>
 				<node name="Selection" value="Selection">
-					<node name="enableSelection" value="Enable Text Selection"/>
+					<node name="enableSelection" value="Enable Text Selection" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Always Use My Own Fonts" />
 				</node>
 				<node name="Margins" value="Margins">
-					<node name="left" value="Left Margin"/>
-					<node name="right" value="Right Margin"/>
-					<node name="top" value="Top Margin"/>
-					<node name="bottom" value="Bottom Margin"/>
+					<node name="left" value="Left Margin" />
+					<node name="right" value="Right Margin" />
+					<node name="top" value="Top Margin" />
+					<node name="bottom" value="Bottom Margin" />
 				</node>
 				<node name="Format" value="Format">
-					<node name="optionsFor" value="Options for"/>
+					<node name="optionsFor" value="Options for" />
 					<node name="lineSpacing" value="Line Spacing">
-						<node name="unchanged" value="&lt;unchanged&gt;"/>
+						<node name="unchanged" value="&lt;unchanged&gt;" />
 					</node>
-					<node name="firstLineIndent" value="First Line Indent"/>
+					<node name="firstLineIndent" value="First Line Indent" />
 					<node name="alignment" value="Alignment">
-						<node name="left" value="Left"/>
-						<node name="right" value="Right"/>
-						<node name="center" value="Center"/>
-						<node name="justify" value="Justify"/>
-						<node name="unchanged" value="&lt;unchanged&gt;"/>
+						<node name="left" value="Left" />
+						<node name="right" value="Right" />
+						<node name="center" value="Center" />
+						<node name="justify" value="Justify" />
+						<node name="unchanged" value="&lt;unchanged&gt;" />
 					</node>
-					<node name="spaceBefore" value="Space Before"/>
-					<node name="spaceAfter" value="Space After"/>
-					<node name="leftIndent" value="Left Indent"/>
-					<node name="rightIndent" value="Right Indent"/>
+					<node name="spaceBefore" value="Space Before" />
+					<node name="spaceAfter" value="Space After" />
+					<node name="startIndent" value="Line Start Indent" />
+					<node name="endIndent" value="Line End Indent" />
 				</node>
 				<node name="Styles" value="Styles">
-					<node name="optionsFor" value="Options for"/>
+					<node name="optionsFor" value="Options for" />
 					<node name="fontFamily" value="Family">
-						<node name="unchanged" value="&lt;unchanged&gt;"/>
+						<node name="unchanged" value="&lt;unchanged&gt;" />
 					</node>
-					<node name="fontSize" value="Size"/>
-					<node name="fontSizeDifference" value="Size Difference"/>
-					<node name="bold" value="Bold"/>
-					<node name="italic" value="Italic"/>
-					<node name="allowHyphenations" value="Allow Hyphenations"/>
-					<node name="autoHyphenations" value="Auto Hyphenations"/>
+					<node name="fontSize" value="Size" />
+					<node name="fontSizeDifference" value="Size Difference" />
+					<node name="bold" value="Bold" />
+					<node name="italic" value="Italic" />
+					<node name="allowHyphenations" value="Allow Hyphenations" />
+					<node name="autoHyphenations" value="Auto Hyphenations" />
 				</node>
 				<node name="Rotation" value="Rotation">
 					<node name="direction" value="Rotation Type">
-						<node name="disabled" value="Disabled"/>
-						<node name="clockwise" value="90 Degrees Clockwise"/>
-						<node name="counterclockwise" value="90 Degrees Counterclockwise"/>
-						<node name="180" value="180 Degrees"/>
-						<node name="cycle" value="Cycle Through All 4 Directions"/>
+						<node name="disabled" value="Disabled" />
+						<node name="clockwise" value="90 Degrees Clockwise" />
+						<node name="counterclockwise" value="90 Degrees Counterclockwise" />
+						<node name="180" value="180 Degrees" />
+						<node name="cycle" value="Cycle Through All 4 Directions" />
 					</node>
 				</node>
 				<node name="Colors" value="Colors">
 					<node name="colorFor" value="Color for">
-						<node name="background" value="Background"/>
-						<node name="selectionBackground" value="Selection Background"/>
-						<node name="text" value="Regular Text"/>
-						<node name="internalLink" value="Internal Hyperlink Text"/>
-						<node name="externalLink" value="External Hyperlink Text"/>
-						<node name="highlighted" value="Highlighted Text"/>
-						<node name="treeLines" value="Tree Lines"/>
-						<node name="indicator" value="Position Indicator"/>
+						<node name="background" value="Background" />
+						<node name="selectionBackground" value="Selection Background" />
+						<node name="text" value="Regular Text" />
+						<node name="internalLink" value="Internal Hyperlink Text" />
+						<node name="externalLink" value="External Hyperlink Text" />
+						<node name="bookLink" value="Link to Another Book" />
+						<node name="highlighted" value="Highlighted Text" />
+						<node name="treeLines" value="Tree Lines" />
+						<node name="indicator" value="Position Indicator" />
 					</node>
 				</node>
 				<node name="Keys" value="Keys">
-					<node name="grabSystemKeys" value="Grab System Keys"/>
-					<node name="separate" value="Keybindings Depend on Orientation"/>
-					<node name="orientation" value="Orientation"/>
+					<node name="grabSystemKeys" value="Grab System Keys" />
+					<node name="separate" value="Keybindings Depend on Orientation" />
+					<node name="orientation" value="Orientation" />
 					<node name="action">
-						<node name="none" value="None"/>
-						<node name="showLibrary" value="Show Library"/>
-						<node name="showRecent" value="Show Recent Books"/>
-						<node name="previousBook" value="Open Previous Book"/>
-						<node name="toc" value="Show Table of Contents"/>
-						<node name="gotoHome" value="Go to Home"/>
-						<node name="gotoSectionStart" value="Go to Start of Section"/>
-						<node name="gotoSectionEnd" value="Go to End of Section"/>
-						<node name="nextTOCSection" value="Go to Next TOC Section"/>
-						<node name="previousTOCSection" value="Go to Previous TOC Section"/>
-						<node name="largeScrollForward" value="Large Scroll Forward"/>
-						<node name="largeScrollBackward" value="Large Scroll Backward"/>
-						<node name="smallScrollForward" value="Small Scroll Forward"/>
-						<node name="smallScrollBackward" value="Small Scroll Backward"/>
-						<node name="undo" value="Undo"/>
-						<node name="redo" value="Redo"/>
-						<node name="copyToClipboard" value="Copy Selected Text to Clipboard"/>
-						<node name="openInDictionary" value="Open Selected Text in Dictionary"/>
-						<node name="clearSelection" value="Clear Selection"/>
-						<node name="search" value="Search"/>
-						<node name="findPrevious" value="Find Previous"/>
-						<node name="findNext" value="Find Next"/>
-						<node name="increaseFont" value="Increase Font Size"/>
-						<node name="decreaseFont" value="Decrease Font Size"/>
-						<node name="toggleIndicator" value="Toggle Position Indicator"/>
-						<node name="toggleFullscreen" value="Toggle Fullscreen Mode"/>
-						<node name="onFullscreen" value="Switch to Fullscreen Mode"/>
-						<node name="rotate" value="Rotate Screen"/>
-						<node name="preferences" value="Show Options Dialog"/>
-						<node name="bookInfo" value="Show Book Info Dialog"/>
-						<node name="addBook" value="Add Book"/>
-						<node name="cancel" value="Cancel"/>
-						<node name="quit" value="Quit"/>
+						<node name="none" value="None" />
+						<node name="showLibrary" value="Show Library" />
+						<node name="showNetLibrary" value="Show Network Library" />
+						<node name="showRecent" value="Show Recent Books" />
+						<node name="previousBook" value="Open Previous Book" />
+						<node name="toc" value="Show Table of Contents" />
+						<node name="gotoHome" value="Go to Home" />
+						<node name="gotoSectionStart" value="Go to Start of Section" />
+						<node name="gotoSectionEnd" value="Go to End of Section" />
+						<node name="nextTOCSection" value="Go to Next TOC Section" />
+						<node name="previousTOCSection" value="Go to Previous TOC Section" />
+						<node name="largeScrollForward" value="Large Scroll Forward" />
+						<node name="largeScrollBackward" value="Large Scroll Backward" />
+						<node name="smallScrollForward" value="Small Scroll Forward" />
+						<node name="smallScrollBackward" value="Small Scroll Backward" />
+						<node name="undo" value="Undo" />
+						<node name="redo" value="Redo" />
+						<node name="copyToClipboard" value="Copy Selected Text to Clipboard" />
+						<node name="openInDictionary" value="Open Selected Text in Dictionary" />
+						<node name="clearSelection" value="Clear Selection" />
+						<node name="search" value="Search" />
+						<node name="findPrevious" value="Find Previous" />
+						<node name="findNext" value="Find Next" />
+						<node name="increaseFont" value="Increase Font Size" />
+						<node name="decreaseFont" value="Decrease Font Size" />
+						<node name="toggleIndicator" value="Toggle Position Indicator" />
+						<node name="toggleFullscreen" value="Toggle Fullscreen Mode" />
+						<node name="rotate" value="Rotate Screen" />
+						<node name="preferences" value="Show Options Dialog" />
+						<node name="bookInfo" value="Show Book Info Dialog" />
+						<node name="addBook" value="Add Book" />
+						<node name="cancel" value="Cancel" />
+						<node name="quit" value="Quit" />
 					</node>
-					<node name="quitOnCancel" value="Quit Application on Cancel"/>
-					<node name="keyDelay" value="Delay Between Accepted Key Pressings"/>
+					<node name="quitOnCancel" value="Quit Application on Cancel" />
+					<node name="keyDelay" value="Delay Between Accepted Key Pressings" />
 				</node>
 				<node name="Config" value="Config">
-					<node name="autoSave" value="Save State Automatically"/>
-					<node name="timeout" value="Timeout between Savings, seconds"/>
+					<node name="autoSave" value="Save State Automatically" />
+					<node name="timeout" value="Timeout between Savings, seconds" />
 				</node>
 				<node name="Dictionary" value="Dictionary">
-					<node name="enableIntegration" value="Enable Integration with %s"/>
-					<node name="defaultText" value="Enable Integration with Dictionary"/>
-					<node name="choice" value="Integrate with"/>
-					<node name="singleClickOpen" value="Open by Single Click"/>
+					<node name="enableIntegration" value="Enable Integration with %s" />
+					<node name="defaultText" value="Enable Integration with Dictionary" />
+					<node name="choice" value="Integrate with" />
+					<node name="singleClickOpen" value="Open by Single Click" />
 				</node>
 				<node name="Web" value="Web">
-					<node name="enableIntegration" value="Open External Links in %s"/>
-					<node name="defaultText" value="Open External Links in Browser"/>
-					<node name="choice" value="Use Browser"/>
-					<node name="command" value="Command to Execute"/>
+					<node name="enableIntegration" value="Open External Links in %s" />
+					<node name="defaultText" value="Open External Links in Browser" />
+					<node name="choice" value="Use Browser" />
+					<node name="command" value="Command to Execute" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press"/>
-					<node name="minStylusPressure" value="Minimal Stylus Pressure"/>
-					<node name="maxStylusPressure" value="Maximal Stylus Pressure"/>
+					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press" />
+					<node name="minStylusPressure" value="Minimal Stylus Pressure" />
+					<node name="maxStylusPressure" value="Maximal Stylus Pressure" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Book Info"/>
+			<node name="title" value="FBReader - Book Info" />
 			<node name="tab">
 				<node name="Common" value="Common">
-					<node name="file" value="File"/>
-					<node name="title" value="Title"/>
-					<node name="authorDisplayName" value="Author (Display Name)"/>
-					<node name="authorSortKey" value="Author (Sort Key)"/>
-					<node name="language" value="Language"/>
-					<node name="encodingSet" value="Encoding Set"/>
-					<node name="encoding" value="Encoding"/>
+					<node name="file" value="File" />
+					<node name="title" value="Title" />
+					<node name="authorDisplayName" value="Author (Display Name)" />
+					<node name="authorSortKey" value="Author (Sort Key)" />
+					<node name="language" value="Language" />
+					<node name="encodingSet" value="Encoding Set" />
+					<node name="encoding" value="Encoding" />
 				</node>
 				<node name="Series" value="Series">
-					<node name="seriesTitle" value="Series Title"/>
-					<node name="bookNumber" value="Book Number"/>
+					<node name="seriesTitle" value="Series Title" />
+					<node name="bookNumber" value="Book Number" />
 				</node>
 				<node name="Tags" value="Tags">
-					<node name="tags" value="Tag List"/>
+					<node name="tags" value="Tag List" />
 				</node>
 				<node name="Text" value="Text">
-					<node name="breakType" value="Break Paragraph at"/>
-					<node name="ignoreIndent" value="Ignore Indent Less than"/>
-					<node name="buildTOC" value="Build Table of Contents"/>
-					<node name="emptyLines" value="Empty Lines Before New Section"/>
+					<node name="breakType" value="Break Paragraph at" />
+					<node name="ignoreIndent" value="Ignore Indent Less than" />
+					<node name="buildTOC" value="Build Table of Contents" />
+					<node name="emptyLines" value="Empty Lines Before New Section" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Break Paragraph at"/>
-					<node name="ignoreIndent" value="Ignore Indent Less than"/>
-					<node name="buildTOC" value="Build Table of Contents"/>
-					<node name="emptyLines" value="Empty Lines Before New Section"/>
+					<node name="breakType" value="Break Paragraph at" />
+					<node name="ignoreIndent" value="Ignore Indent Less than" />
+					<node name="buildTOC" value="Build Table of Contents" />
+					<node name="emptyLines" value="Empty Lines Before New Section" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Add Book to the Library"/>
+			<node name="title" value="FBReader - Add Book to the Library" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Text Search"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="&amp;Ignore case"/>
-			<node name="wholeText" value="In w&amp;hole text"/>
-			<node name="backward" value="&amp;Backward"/>
-			<node name="currentSection" value="&amp;This section only"/>
+			<node name="title" value="Text Search" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="&amp;Ignore case" />
+			<node name="wholeText" value="In w&amp;hole text" />
+			<node name="backward" value="&amp;Backward" />
+			<node name="currentSection" value="&amp;This section only" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Network Search" />
+			<node name="bookTitle" value="Title" />
+			<node name="author" value="Author" />
+			<node name="category" value="Category" />
+			<node name="series" value="Series" />
+			<node name="description" value="Description" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Go To Page"/>
-			<node name="pageNumber" value="Go to Page Number"/>
+			<node name="title" value="Go To Page" />
+			<node name="pageNumber" value="Go to Page Number" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Edit/Clone Tag"/>
+			<node name="title" value="Edit/Clone Tag" />
 			<node name="editOrClone" value="Action">
-				<node name="edit" value="Rename Tag"/>
-				<node name="clone" value="Clone Tag"/>
+				<node name="edit" value="Rename Tag" />
+				<node name="clone" value="Clone Tag" />
 			</node>
-			<node name="name" value="Tag Name"/>
-			<node name="includeSubtags" value="Include Subtags"/>
+			<node name="name" value="Tag Name" />
+			<node name="includeSubtags" value="Include Subtags" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Remove Book"/>
-			<node name="message" value="Remove Book &#10;&#8220;%s&#8221;&#10; from the Library?"/>
+			<node name="title" value="Remove Book" />
+			<node name="message" value="Remove Book &#10;&#8220;%s&#8221;&#10; from the Library?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Remove Tag"/>
-			<node name="message" value="Remove Tag &#8220;%s&#8221;?"/>
+			<node name="title" value="Remove Tag" />
+			<node name="message" value="Remove Tag &#8220;%s&#8221;?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Error"/>
-			<node name="message" value="Couldn't open:&#10;%s"/>
+			<node name="title" value="Error" />
+			<node name="message" value="Couldn&apos;t open:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Error"/>
-			<node name="message" value="Help file not found, sorry"/>
+			<node name="title" value="Error" />
+			<node name="message" value="Help file not found, sorry" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Error"/>
-			<node name="message" value="Tag name must be a non-empty string"/>
+			<node name="title" value="Error" />
+			<node name="message" value="Tag name must be a non-empty string" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Error"/>
-			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol"/>
+			<node name="title" value="Error" />
+			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Empty libraries list" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Error while downloading" />
+			<node name="message" value="Can&apos;t download this book at the moment" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Loading book. Please, wait..."/>
-			<node name="loadingBookList" value="Loading book list. Please, wait..."/>
-			<node name="migrate" value="Upgrading to the new version. Please, wait..."/>
+			<node name="loadingBook" value="Loading book. Please, wait..." />
+			<node name="loadingBookList" value="Loading book list. Please, wait..." />
+			<node name="migrate" value="Upgrading to the new version. Please, wait..." />
+			<node name="downloadBookList" value="Downloading book list. Please, wait..." />
+			<node name="downloadBook" value="Downloading book. Please, wait..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="Base"/>
-		<node name="Regular Paragraph" value="Regular Paragraph"/>
-		<node name="Title" value="Title"/>
-		<node name="Section Title" value="Section Title"/>
-		<node name="Poem Title" value="Poem Title"/>
-		<node name="Subtitle" value="Subtitle"/>
-		<node name="Annotation" value="Annotation"/>
-		<node name="Epigraph" value="Epigraph"/>
-		<node name="Stanza" value="Stanza"/>
-		<node name="Verse" value="Verse"/>
-		<node name="Preformatted text" value="Preformatted text"/>
-		<node name="Image" value="Image"/>
-		<node name="Cite" value="Cite"/>
-		<node name="Author" value="Author"/>
-		<node name="Date" value="Date"/>
-		<node name="Internal Hyperlink" value="Internal Hyperlink"/>
-		<node name="Footnote" value="Footnote"/>
-		<node name="Emphasis" value="Emphasis"/>
-		<node name="Strong" value="Strong"/>
-		<node name="Subscript" value="Subscript"/>
-		<node name="Superscript" value="Superscript"/>
-		<node name="Code" value="Code"/>
-		<node name="StrikeThrough" value="StrikeThrough"/>
-		<node name="Contents Table" value="Contents Table"/>
-		<node name="Author in Library" value="Author in Library"/>
-		<node name="Book in Library" value="Book in Library"/>
-		<node name="Recent Book List" value="Recent Book List"/>
-		<node name="Italic" value="Italic"/>
-		<node name="Bold" value="Bold"/>
-		<node name="Definition" value="Definition"/>
-		<node name="Definition Description" value="Definition Description"/>
-		<node name="Header 1" value="Header 1"/>
-		<node name="Header 2" value="Header 2"/>
-		<node name="Header 3" value="Header 3"/>
-		<node name="Header 4" value="Header 4"/>
-		<node name="Header 5" value="Header 5"/>
-		<node name="Header 6" value="Header 6"/>
-		<node name="External Hyperlink" value="External Hyperlink"/>
+		<node name="Base" value="Base" />
+		<node name="Regular Paragraph" value="Regular Paragraph" />
+		<node name="Title" value="Title" />
+		<node name="Section Title" value="Section Title" />
+		<node name="Poem Title" value="Poem Title" />
+		<node name="Subtitle" value="Subtitle" />
+		<node name="Annotation" value="Annotation" />
+		<node name="Epigraph" value="Epigraph" />
+		<node name="Stanza" value="Stanza" />
+		<node name="Verse" value="Verse" />
+		<node name="Preformatted text" value="Preformatted text" />
+		<node name="Image" value="Image" />
+		<node name="Cite" value="Cite" />
+		<node name="Author" value="Author" />
+		<node name="Date" value="Date" />
+		<node name="Internal Hyperlink" value="Internal Hyperlink" />
+		<node name="Footnote" value="Footnote" />
+		<node name="Emphasis" value="Emphasis" />
+		<node name="Strong" value="Strong" />
+		<node name="Subscript" value="Subscript" />
+		<node name="Superscript" value="Superscript" />
+		<node name="Code" value="Code" />
+		<node name="StrikeThrough" value="StrikeThrough" />
+		<node name="Contents Table" value="Contents Table" />
+		<node name="Library Entry" value="Library Entry" />
+		<node name="Recent Book List" value="Recent Book List" />
+		<node name="Italic" value="Italic" />
+		<node name="Bold" value="Bold" />
+		<node name="Definition" value="Definition" />
+		<node name="Definition Description" value="Definition Description" />
+		<node name="Header 1" value="Header 1" />
+		<node name="Header 2" value="Header 2" />
+		<node name="Header 3" value="Header 3" />
+		<node name="Header 4" value="Header 4" />
+		<node name="Header 5" value="Header 5" />
+		<node name="Header 6" value="Header 6" />
+		<node name="External Hyperlink" value="External Hyperlink" />
+		<node name="Link to Another Book" value="Link to Another Book" />
 	</node>
 	<node name="external">
-		<node name="browser" value="Browser"/>
-		<node name="defaultBrowser" value="Default Browser"/>
+		<node name="browser" value="Browser" />
+		<node name="defaultBrowser" value="Default Browser" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="Unknown Error"/>
-		<node name="unsupportedCompressionMethod" value="Unsupported Compression Method"/>
-		<node name="encriptedFile" value="DRM-protected File"/>
+		<node name="unknown" value="Unknown Error" />
+		<node name="unsupportedCompressionMethod" value="Unsupported Compression Method" />
+		<node name="encriptedFile" value="DRM-protected File" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Network Library" />
+		<node name="startText" value="Please enter a search pattern in the text field on the toolbar and press &lt;Return&gt;." />
+		<node name="notFound" value="Sorry, no suitable books were found." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Library"/>
-		<node name="allBooks" value="All Books"/>
-		<node name="booksWithoutTags" value="Books with no Tags"/>
-		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button."/>
+		<node name="caption" value="Library" />
+		<node name="allBooks" value="All Books" />
+		<node name="booksWithoutTags" value="Books with no Tags" />
+		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/fi.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/fi.xml
--- fbreader-0.8.17/fbreader/data/resources/fi.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/fi.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,423 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Finnish FBReader resources, by Marko Vertainen -->
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Kirjan tiedot..."/>
-	  <node name="toc" value="Sisällysluettolo"/>
+	<node name="menu">
+		<node name="bookInfo" value="Kirjan tiedot..." />
+		<node name="toc" value="Sisällysluettelo" />
 		<node name="library" value="Kirjasto">
-			<node name="showLibrary" value="Avaa"/>
-			<node name="previousBook" value="Edellinen kirja"/>
-			<node name="showRecent" value="Viimeisin"/>
-			<node name="addBook" value="Lisää kirja..."/>
-			<node name="showHelp" value="Tietoja FBReaderista"/>
+			<node name="showLibrary" value="Avaa kirjasto" />
+			<node name="previousBook" value="Edellinen kirja" />
+			<node name="showRecent" value="Viimeisimmät kirjat" />
+			<node name="addBook" value="Lisää kirja..." />
+			<node name="showHelp" value="Tietoja FBReaderista" />
 		</node>
 		<node name="navigate" value="Navigoi">
-			<node name="gotoHome" value="Siirry dokumentin alkuun"/>
-			<node name="gotoPageNumber" value="Siirry sivulle..."/>
-			<node name="gotoSectionStart" value="Siirry tekstiosion alkuun"/>
-			<node name="gotoSectionEnd" value="Siirry tekstiosion loppuun"/>
-			<node name="nextTOCSection" value="Sisällysluettelon seuraavaan kohtaan"/>
-			<node name="previousTOCSection" value="Sisällysluettelon edelliseen kohtaan"/>
-			<node name="undo" value="Siirry edelliseen kohtaan"/>
-			<node name="redo" value="Siirry eteenpäin"/>
+			<node name="gotoHome" value="Siirry dokumentin alkuun" />
+			<node name="gotoPageNumber" value="Siirry sivulle..." />
+			<node name="gotoSectionStart" value="Siirry tekstiosion alkuun" />
+			<node name="gotoSectionEnd" value="Siirry tekstiosion loppuun" />
+			<node name="nextTOCSection" value="Sisällysluettelon seuraavaan kohtaan" />
+			<node name="previousTOCSection" value="Sisällysluettelon edelliseen kohtaan" />
+			<node name="undo" value="Siirry edelliseen kohtaan" />
+			<node name="redo" value="Siirry eteenpäin" />
 		</node>
 		<node name="selection" value="Valinta">
-			<node name="copyToClipboard" value="Kopioi leikepöydälle"/>
-			<node name="openInDictionary" value="Avaa sanakirjassa"/>
-			<node name="clearSelection" value="Tyhjennä"/>
+			<node name="copyToClipboard" value="Kopioi leikepöydälle" />
+			<node name="openInDictionary" value="Avaa sanakirjassa" />
+			<node name="clearSelection" value="Tyhjennä" />
 		</node>
 		<node name="search" value="Etsi">
-			<node name="search" value="Etsi teksti..."/>
-			<node name="findNext" value="Etsi seuraava"/>
-			<node name="findPrevious" value="Etsi edellinen"/>
+			<node name="search" value="Etsi teksti..." />
+			<node name="findNext" value="Etsi seuraava" />
+			<node name="findPrevious" value="Etsi edellinen" />
 		</node>
 		<node name="view" value="Näytä">
-			<node name="rotate" value="Kierrä näyttö"/>
-			<node name="toggleFullscreen" value="Koko näyttö"/>
-			<node name="toggleIndicator" value="Sijainninilmaisin päällä/pois"/>
+			<node name="rotate" value="Kierrä näyttö" />
+			<node name="toggleFullscreen" value="Koko näyttö" />
+			<node name="toggleIndicator" value="Sijainninilmaisin" />
 		</node>
-		<node name="preferences" value="Asetukset..."/>
-		<node name="quit" value="Sulje"/>
+		<node name="preferences" value="Asetukset..." />
+		<node name="quit" value="Sulje" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Näytä kirjastopuu"/>
-		<node name="showRecent" value="Näytä viimeisimmät kirjat"/>
-		<node name="addBook" value="Lisää tiedosto kirjastoon"/>
-		<node name="gotoHome" value="Siirry tekstin alkuun"/>
-		<node name="undo" value="Siirry edelliseen kohtaan"/>
-		<node name="redo" value="Siirry eteenpäin"/>
-		<node name="toc" value="Sisällysluettelo"/>
-		<node name="search" value="Etsi teksti"/>
-		<node name="findNext" value="Etsi seuraava"/>
-		<node name="findPrevious" value="Etsi edellinen"/>
-		<node name="bookInfo" value="Näytä kirjan tiedot valintaikkuna"/>
-		<node name="preferences" value="Näytä asetukset valintaikkuna"/>
-		<node name="rotate" value="Kierrä teksti"/>
-		<node name="showHelp" value="Tietoja FBReaderista"/>
+		<node name="showReading" value="Näytä lukutila" />
+		<node name="showLibrary" value="Näytä kirjastopuu">
+			<node name="popup" value="Näytä viimeisimmät kirjat lista" />
+		</node>
+		<node name="showRecent" value="Näytä viimeisimmät kirjat" />
+		<node name="byAuthor" value="Lajittele kirjat tekijän mukaan" />
+		<node name="byTag" value="Lajittele kirjat luokan mukaan" />
+		<node name="addBook" value="Lisää tiedosto kirjastoon" />
+		<node name="showNetLibrary" value="Etsi verkkokirjastoista" />
+		<node name="searchOnNetwork" value="Verkkohaku" />
+		<node name="advancedSearchOnNetwork" value="Tarkennettu verkkohaku" />
+		<node name="gotoHome" value="Siirry tekstin alkuun" />
+		<node name="undo" value="Siirry edelliseen kohtaan" />
+		<node name="redo" value="Siirry eteenpäin" />
+		<node name="gotoPageNumberWithParameter" value="Siirry sivulle" />
+		<node name="toc" value="Sisällysluettelo" />
+		<node name="search" value="Etsi teksti" />
+		<node name="findNext" value="Etsi seuraava" />
+		<node name="findPrevious" value="Etsi edellinen" />
+		<node name="bookInfo" value="Näytä kirjan tiedot valintaikkuna" />
+		<node name="preferences" value="Näytä asetukset valintaikkuna" />
+		<node name="rotate" value="Kierrä teksti" />
+		<node name="showHelp" value="Tietoja FBReaderista" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Siirry"/>
-			<node name="thisOnly" value="Vain tämä"/>
-			<node name="withSubtags" value="Alamerkityt"/>
+			<node name="go" value="&amp;Siirry" />
+			<node name="thisOnly" value="Vain tämä" />
+			<node name="withSubtags" value="Alaluokalliset" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Asetukset"/>
+			<node name="title" value="FBReader - Asetukset" />
 			<node name="tab">
 				<node name="Library" value="Kirjasto">
-					<node name="bookPath" value="Kirjaston polku"/>
-					<node name="lookInSubdirectories" value="Hae kirjoja alihakemistoista"/>
-					<node name="recentListSize" value="Viimeisimmät kirjat listan koko"/>
-					<node name="showTags" value="Näytä merkki hierarkiat"/>
-					<node name="showAllBooksList" value="Näytä kaikki kirjat haara"/>
+					<node name="bookPath" value="Kirjaston hakemisto" />
+					<node name="lookInSubdirectories" value="Hae kirjoja alihakemistoista" />
+					<node name="collectBooksWithoutMetaInfo" value="Ryhmitä ilman metatietoja olevat kirjat" />
+					<node name="downloadDirectory" value="Ladattujen kirjojen hakemisto" />
+					<node name="showAllBooksTag" value="Näytä kaikki kirjat ryhmä" />
+				</node>
+				<node name="NetworkLibrary" value="Verkkohaku">
+					<node name="useProxy" value="Käytä välityspalvelinta" />
+					<node name="proxyHost" value="Välityspalvelimen osoite" />
+					<node name="proxyPort" value="Välityspalvelimen portti" />
+					<node name="timeout" value="Verkkotoimintojen aikakatkaisu sekunteina" />
 				</node>
 				<node name="Language" value="Kieli">
-					<node name="autoDetect" value="Tunnista kieli ja merkistö automaattisesti"/>
-					<node name="defaultLanguage" value="Oletuskieli"/>
-					<node name="defaultEncodingSet" value="Oletusmerkistöalue"/>
-					<node name="defaultEncoding" value="Oletusmerkistö"/>
-					<node name="useWindows1252Hack" value="Käytä windows-1252 merkistöä iso-8859-1 sijaan"/>
+					<node name="autoDetect" value="Tunnista kieli ja merkistö automaattisesti" />
+					<node name="defaultLanguage" value="Oletuskieli" />
+					<node name="defaultEncodingSet" value="Oletusmerkistöalue" />
+					<node name="defaultEncoding" value="Oletusmerkistö" />
+					<node name="useWindows1252Hack" value="Käytä windows-1252 merkistöä iso-8859-1 sijaan" />
 				</node>
 				<node name="Indicator" value="Ilmaisin">
-					<node name="show" value="Näytä sijainninilmaisin"/>
-					<node name="height" value="Ilmaisimen korkeus"/>
-					<node name="offset" value="Etäisyys tekstistä"/>
-					<node name="pageNumber" value="Näytä sijainti numeroina"/>
-					<node name="time" value="Näytä aika"/>
-					<node name="fontSize" value="Kirjasinkoko"/>
-					<node name="tocMarks" value="Näytä sisällysmerkit"/>
-					<node name="navigation" value="Salli navigointi"/>
+					<node name="type" value="Näytä">
+						<node name="osScrollbar" value="Vierityspalkki" />
+						<node name="fbIndicator" value="Perinteinen ilmaisin" />
+						<node name="none" value="Ei ilmaisinta" />
+					</node>
+					<node name="height" value="Ilmaisimen korkeus" />
+					<node name="offset" value="Etäisyys tekstistä" />
+					<node name="pageNumber" value="Näytä sijainti numeroina" />
+					<node name="time" value="Näytä aika" />
+					<node name="fontSize" value="Kirjasinkoko" />
+					<node name="tocMarks" value="Näytä sisällysmerkit" />
+					<node name="navigation" value="Salli navigointi" />
 				</node>
 				<node name="Scrolling" value="Vieritys">
 					<node name="optionsFor" value="Valinnat">
-						<node name="large" value="Sivun vieritykselle"/>
-						<node name="small" value="Rivin vieritykselle"/>
-						<node name="mouse" value="Hiirellä vieritykselle"/>
-						<node name="tap" value="Kosketusnäyttö vieritykselle"/>
+						<node name="large" value="Suurelle vieritykselle" />
+						<node name="small" value="Pienelle vieritykselle" />
+						<node name="mouse" value="Hiirellä vieritykselle" />
+						<node name="tap" value="Kosketus vieritykselle" />
 					</node>
-					<node name="delay" value="Vieritysten viive, msec"/>
+					<node name="delay" value="Vieritysten viive, msec" />
 					<node name="mode" value="Vieritystila">
-						<node name="noOverlapping" value="Sivu kerrallaan"/>
-						<node name="keepLines" value="Säilytä rivit"/>
-						<node name="scrollLines" value="Vieritä rivit"/>
-						<node name="scrollPercentage" value="Prosentuaalinen vieritys"/>
-						<node name="disable" value="Poista käytöstä"/>
+						<node name="noOverlapping" value="Sivu kerrallaan" />
+						<node name="keepLines" value="Säilytä rivit" />
+						<node name="scrollLines" value="Vieritä rivit" />
+						<node name="scrollPercentage" value="Prosentuaalinen vieritys" />
+						<node name="disable" value="Poista käytöstä" />
 					</node>
-					<node name="linesToKeep" value="Rivien määrä"/>
-					<node name="linesToScroll" value="Rivien määrä"/>
-					<node name="percentToScroll" value="Vieritysprosentti"/>
-					<node name="fingerOnly" value="Vieritä ainoastaan kosketusnäytöstä"/>
+					<node name="linesToKeep" value="Rivien määrä" />
+					<node name="linesToScroll" value="Rivien määrä" />
+					<node name="percentToScroll" value="Vieritysprosentti" />
+					<node name="fingerOnly" value="Vieritä ainoastaan kosketuksesta" />
 				</node>
 				<node name="Selection" value="Valinta">
-					<node name="enableSelection" value="Ota käyttöön tekstin valinta"/>
+					<node name="enableSelection" value="Ota käyttöön tekstinvalinta" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Käytä aina omaa kirjasinta" />
 				</node>
 				<node name="Margins" value="Reunus">
-					<node name="left" value="Vasenreunus"/>
-					<node name="right" value="Oikeareunus"/>
-					<node name="top" value="Yläreunus"/>
-					<node name="bottom" value="Alareunus"/>
+					<node name="left" value="Vasenreunus" />
+					<node name="right" value="Oikeareunus" />
+					<node name="top" value="Yläreunus" />
+					<node name="bottom" value="Alareunus" />
 				</node>
 				<node name="Format" value="Muotoilu">
-					<node name="optionsFor" value="Asetukset"/>
+					<node name="optionsFor" value="Asetukset" />
 					<node name="lineSpacing" value="Riviväli">
-						<node name="unchanged" value="&lt;ei muutosta&gt;"/>
+						<node name="unchanged" value="&lt;ei muutosta&gt;" />
 					</node>
-					<node name="firstLineIndent" value="1. rivin sisennys"/>
+					<node name="firstLineIndent" value="1. rivin sisennys" />
 					<node name="alignment" value="Tasaus">
-						<node name="left" value="Vasen"/>
-						<node name="right" value="Oikea"/>
-						<node name="center" value="Keskitetty"/>
-						<node name="justify" value="Tasattu"/>
-						<node name="unchanged" value="&lt;ei muutosta&gt;"/>
+						<node name="left" value="Vasen" />
+						<node name="right" value="Oikea" />
+						<node name="center" value="Keskitetty" />
+						<node name="justify" value="Tasattu" />
+						<node name="unchanged" value="&lt;ei muutosta&gt;" />
 					</node>
-					<node name="spaceBefore" value="Väli ennen"/>
-					<node name="spaceAfter" value="Väli jälkeen"/>
-					<node name="leftIndent" value="Vasen sisennys"/>
-					<node name="rightIndent" value="Oikea sisennys"/>
+					<node name="spaceBefore" value="Väli ennen" />
+					<node name="spaceAfter" value="Väli jälkeen" />
+					<node name="startIndent" value="Rivin alun sisennys" />
+					<node name="endIndent" value="Rivin lopun sisennys" />
 				</node>
 				<node name="Styles" value="Tyylit">
-					<node name="optionsFor" value="Asetukset"/>
+					<node name="optionsFor" value="Asetukset" />
 					<node name="fontFamily" value="Kirjasinperhe">
-						<node name="unchanged" value="&lt;ei muutosta&gt;"/>
+						<node name="unchanged" value="&lt;ei muutosta&gt;" />
 					</node>
-					<node name="fontSize" value="Koko"/>
-					<node name="fontSizeDifference" value="Koon ero"/>
-					<node name="bold" value="Lihavoitu"/>
-					<node name="italic" value="Kursivoitu"/>
-					<node name="allowHyphenations" value="Salli tavutus"/>
-					<node name="autoHyphenations" value="Automaattinen tavutus"/>
+					<node name="fontSize" value="Koko" />
+					<node name="fontSizeDifference" value="Koon ero" />
+					<node name="bold" value="Lihavoitu" />
+					<node name="italic" value="Kursivoitu" />
+					<node name="allowHyphenations" value="Salli tavutus" />
+					<node name="autoHyphenations" value="Automaattinen tavutus" />
 				</node>
 				<node name="Rotation" value="Kierto">
 					<node name="direction" value="Kiertämistapa">
-						<node name="disabled" value="Pois käytöstä"/>
-						<node name="clockwise" value="90 astetta myötäpäivään"/>
-						<node name="counterclockwise" value="90 astetta vastapäivään"/>
-						<node name="180" value="180 astetta"/>
-						<node name="cycle" value="Kierrä neljä suuntaa"/>
+						<node name="disabled" value="Pois käytöstä" />
+						<node name="clockwise" value="90 astetta myötäpäivään" />
+						<node name="counterclockwise" value="90 astetta vastapäivään" />
+						<node name="180" value="180 astetta" />
+						<node name="cycle" value="Kierrä neljä suuntaa" />
 					</node>
 				</node>
 				<node name="Colors" value="Värit">
 					<node name="colorFor" value="Värit">
-						<node name="background" value="Taustalle"/>
-						<node name="selectionBackground" value="Valitun tekstin taustalle"/>
-						<node name="text" value="Normaalille tekstille"/>
-						<node name="internalLink" value="Sisäisen linkin tekstille"/>
-						<node name="externalLink" value="Ulkoisen linkin tekstille"/>
-						<node name="highlighted" value="Korostetulle tekstille"/>
-						<node name="treeLines" value="Kirjapuun viivoille"/>
-						<node name="indicator" value="Sijainnin ilmaisimelle"/>
+						<node name="background" value="Taustalle" />
+						<node name="selectionBackground" value="Valitun tekstin taustalle" />
+						<node name="text" value="Normaalille tekstille" />
+						<node name="internalLink" value="Sisäisen linkin tekstille" />
+						<node name="externalLink" value="Ulkoisen linkin tekstille" />
+						<node name="bookLink" value="Linkille toiseen kirjaan" />
+						<node name="highlighted" value="Korostetulle tekstille" />
+						<node name="treeLines" value="Kirjastopuun viivoille" />
+						<node name="indicator" value="Sijainninilmaisimelle" />
 					</node>
 				</node>
-				<node name="Keys" value="Näpäimet">
-					<node name="grabSystemKeys" value="Valitse järjestelmänäppäimet"/>
-					<node name="separate" value="Näytön suunnasta riippuvat näppäintoiminnot"/>
-					<node name="orientation" value="Näytön suuntaus"/>
+				<node name="Keys" value="Näppäimet">
+					<node name="grabSystemKeys" value="Valitse järjestelmänäppäimet" />
+					<node name="separate" value="Näytön suunnasta riippuvat näppäintoiminnot" />
+					<node name="orientation" value="Näytön suuntaus" />
 					<node name="action">
-						<node name="none" value="Ei mitään"/>
-						<node name="showLibrary" value="Näytä kirjasto"/>
-						<node name="showRecent" value="Näytä viimeisimmät kirjat"/>
-						<node name="previousBook" value="Avaa edellinen kirja"/>
-						<node name="toc" value="Näytä sisällysluettelo"/>
-						<node name="gotoHome" value="Siirry alkuun"/>
-						<node name="gotoSectionStart" value="Siirry tekstiosion alkuun"/>
-						<node name="gotoSectionEnd" value="Siirry tekstiosion loppuun"/>
-						<node name="nextTOCSection" value="Sisällysluettelon seuraavaan kohtaan"/>
-						<node name="previousTOCSection" value="Sisällysluettelon edelliseen kohtaan"/>
-						<node name="largeScrollForward" value="Sivunvaihto eteenpäin"/>
-						<node name="largeScrollBackward" value="Sivunvaihto taaksepäin"/>
-						<node name="smallScrollForward" value="Rivinvaihto eteenpäin"/>
-						<node name="smallScrollBackward" value="Rivinvaihto taaksepäin"/>
-						<node name="undo" value="Peru"/>
-						<node name="redo" value="Palauta"/>
-						<node name="copyToClipboard" value="Kopioi valittu teksti leikepöydälle"/>
-						<node name="openInDictionary" value="Avaa valittu teksti sanakirjassa"/>
-						<node name="clearSelection" value="Tyjennä valinta"/>
-						<node name="search" value="Etsi"/>
-						<node name="findPrevious" value="Etsi edellinen"/>
-						<node name="findNext" value="Etsi seuraava"/>
-						<node name="increaseFont" value="Suurenna kirjasinkokoa"/>
-						<node name="decreaseFont" value="Pienennä kirjasinkokoa"/>
-						<node name="toggleIndicator" value="Sijainninilmaisin päällä/pois"/>
-						<node name="toggleFullscreen" value="Koko näyttö päällä/pois"/>
-						<node name="onFullscreen" value="Koko näyttö käyttöön"/>
-						<node name="rotate" value="Kierrä näyttöä"/>
-						<node name="preferences" value="Näytä asetukset valintaikkuna"/>
-						<node name="bookInfo" value="Näytä kirjantidot valintaikkuna"/>
-						<node name="addBook" value="Lisää kirja"/>
-						<node name="cancel" value="Peru"/>
-						<node name="quit" value="Lopeta"/>
+						<node name="none" value="Ei mitään" />
+						<node name="showLibrary" value="Näytä kirjasto" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="Näytä viimeisimmät kirjat" />
+						<node name="previousBook" value="Avaa edellinen kirja" />
+						<node name="toc" value="Näytä sisällysluettelo" />
+						<node name="gotoHome" value="Siirry alkuun" />
+						<node name="gotoSectionStart" value="Siirry tekstiosion alkuun" />
+						<node name="gotoSectionEnd" value="Siirry tekstiosion loppuun" />
+						<node name="nextTOCSection" value="Sisällysluettelon seuraavaan kohtaan" />
+						<node name="previousTOCSection" value="Sisällysluettelon edelliseen kohtaan" />
+						<node name="largeScrollForward" value="Sivunvaihto eteenpäin" />
+						<node name="largeScrollBackward" value="Sivunvaihto taaksepäin" />
+						<node name="smallScrollForward" value="Rivinvaihto eteenpäin" />
+						<node name="smallScrollBackward" value="Rivinvaihto taaksepäin" />
+						<node name="undo" value="Peru" />
+						<node name="redo" value="Palauta" />
+						<node name="copyToClipboard" value="Kopioi valittu teksti leikepöydälle" />
+						<node name="openInDictionary" value="Avaa valittu teksti sanakirjassa" />
+						<node name="clearSelection" value="Tyhjennä valinta" />
+						<node name="search" value="Etsi" />
+						<node name="findPrevious" value="Etsi edellinen" />
+						<node name="findNext" value="Etsi seuraava" />
+						<node name="increaseFont" value="Suurenna kirjasinkokoa" />
+						<node name="decreaseFont" value="Pienennä kirjasinkokoa" />
+						<node name="toggleIndicator" value="Sijainninilmaisin päällä/pois" />
+						<node name="toggleFullscreen" value="Koko näyttö päällä/pois" />
+						<node name="rotate" value="Kierrä näyttöä" />
+						<node name="preferences" value="Näytä asetukset valintaikkuna" />
+						<node name="bookInfo" value="Näytä kirjantiedot valintaikkuna" />
+						<node name="addBook" value="Lisää kirja" />
+						<node name="cancel" value="Peru" />
+						<node name="quit" value="Lopeta" />
 					</node>
-					<node name="quitOnCancel" value="Sulje sovellus peruttaessa"/>
-					<node name="keyDelay" value="Hyväksyttyjen näppäinpainallusten viive"/>
+					<node name="quitOnCancel" value="Sulje sovellus peruttaessa" />
+					<node name="keyDelay" value="Hyväksyttyjen näppäinpainallusten viive" />
 				</node>
 				<node name="Config" value="Tila">
-					<node name="autoSave" value="Tallenna tila automaattisesti"/>
-					<node name="timeout" value="Tallennusvälin aika sekunneissa"/>
+					<node name="autoSave" value="Tallenna tila automaattisesti" />
+					<node name="timeout" value="Tallennusvälin aika sekunneissa" />
 				</node>
 				<node name="Dictionary" value="Sanakirja">
-					<node name="enableIntegration" value="Käytä sanakirjaa: %s"/>
-					<node name="defaultText" value="Käyttöönotettava sanakirja"/>
-					<node name="choice" value="Integroi seuraavan kanssa:"/>
-					<node name="singleClickOpen" value="Avaa yhdellä kosketuksella"/>
+					<node name="enableIntegration" value="Käytä sanakirjaa: %s" />
+					<node name="defaultText" value="Käytettävä sanakirja" />
+					<node name="choice" value="Integroi seuraavan kanssa:" />
+					<node name="singleClickOpen" value="Avaa yhdellä kosketuksella" />
 				</node>
 				<node name="Web" value="Web">
-					<node name="enableIntegration" value="Ulkoisten linkkien avaus: %s"/>
-					<node name="defaultText" value="Avaa ulkoiset linkit selaimessa"/>
-					<node name="choice" value="Käytä selainta"/>
-					<node name="command" value="Suorituskomento"/>
+					<node name="enableIntegration" value="Ulkoisten linkkien avaus: %s" />
+					<node name="defaultText" value="Avaa ulkoiset linkit selaimessa" />
+					<node name="choice" value="Käytä selainta" />
+					<node name="command" value="Suorituskomento" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Toiminta näppäimen vapautuksesta painalluksen sijaan"/>
-					<node name="minStylusPressure" value="Styluksen minimi paine"/>
-					<node name="maxStylusPressure" value="Styluksen maksimi paine"/>
+					<node name="keyActionOnRelease" value="Toiminta näppäimen vapautuksesta painalluksen sijaan" />
+					<node name="minStylusPressure" value="Styluksen minimi paine" />
+					<node name="maxStylusPressure" value="Styluksen maksimi paine" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Kirjan tiedot"/>
+			<node name="title" value="FBReader - Kirjan tiedot" />
 			<node name="tab">
 				<node name="Common" value="Yleiset">
-					<node name="file" value="Tiedosto"/>
-					<node name="title" value="Nimi"/>
-					<node name="authorDisplayName" value="Tekijä (Näytä nimi)"/>
-					<node name="authorSortKey" value="Tekijä (Lajitteluavain)"/>
-					<node name="language" value="Kieli"/>
-					<node name="encodingSet" value="Merkistöalue"/>
-					<node name="encoding" value="Merkistö"/>
+					<node name="file" value="Tiedosto" />
+					<node name="title" value="Nimi" />
+					<node name="authorDisplayName" value="Tekijä (nimi)" />
+					<node name="authorSortKey" value="Tekijä (lajitteluavain)" />
+					<node name="language" value="Kieli" />
+					<node name="encodingSet" value="Merkistöalue" />
+					<node name="encoding" value="Merkistö" />
 				</node>
 				<node name="Series" value="Kirjasarja">
-					<node name="seriesTitle" value="Sarjan nimi"/>
-					<node name="bookNumber" value="Kirjan numero"/>
+					<node name="seriesTitle" value="Sarjan nimi" />
+					<node name="bookNumber" value="Kirjan numero" />
 				</node>
-				<node name="Tags" value="Merkki">
-					<node name="tags" value="Merkkilista"/>
+				<node name="Tags" value="Luokka">
+					<node name="tags" value="Luokkalista" />
 				</node>
 				<node name="Text" value="Teksti">
-					<node name="breakType" value="Katkaise kappale"/>
-					<node name="ignoreIndent" value="Hylkää pienempi sisennys kuin"/>
-					<node name="buildTOC" value="Luo sisällysluettelo"/>
-					<node name="emptyLines" value="Tyhjät rivit ennen uutta osaa"/>
+					<node name="breakType" value="Katkaise kappale" />
+					<node name="ignoreIndent" value="Hylkää pienempi sisennys kuin" />
+					<node name="buildTOC" value="Luo sisällysluettelo" />
+					<node name="emptyLines" value="Tyhjät rivit ennen uutta osaa" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;ESI&gt;">
-					<node name="breakType" value="Katkaise kappale"/>
-					<node name="ignoreIndent" value="Hylkää pienempi sisennys kuin"/>
-					<node name="buildTOC" value="Luo sisällysluettelo"/>
-					<node name="emptyLines" value="Tyhjät rivit ennen uutta osaa"/>
+					<node name="breakType" value="Katkaise kappale" />
+					<node name="ignoreIndent" value="Hylkää pienempi sisennys kuin" />
+					<node name="buildTOC" value="Luo sisällysluettelo" />
+					<node name="emptyLines" value="Tyhjät rivit ennen uutta osaa" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Lisää kirja kirjastoon"/>
+			<node name="title" value="FBReader - Lisää kirja kirjastoon" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Etsi teksti"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="&amp;Älä huomioi kirjainkokoa"/>
-			<node name="wholeText" value="K&amp;oko tekstistä"/>
-			<node name="backward" value="&amp;Taaksepäin"/>
-			<node name="currentSection" value="&amp;Vain tästä osasta"/>
+			<node name="title" value="Etsi teksti" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="&amp;Älä huomioi kirjainkokoa" />
+			<node name="wholeText" value="K&amp;oko tekstistä" />
+			<node name="backward" value="&amp;Taaksepäin" />
+			<node name="currentSection" value="&amp;Vain tästä osasta" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Verkkohaku" />
+			<node name="bookTitle" value="Nimi" />
+			<node name="author" value="Tekijä" />
+			<node name="category" value="Kategoria" />
+			<node name="series" value="Sarja" />
+			<node name="description" value="Kuvaus" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Siirry sivulle"/>
-			<node name="pageNumber" value="Siirry sivunumerolle"/>
+			<node name="title" value="Siirry sivulle" />
+			<node name="pageNumber" value="Siirry sivunumerolle" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Muokkaa/kloonaa merkki"/>
+			<node name="title" value="Muokkaa/kloonaa luokka" />
 			<node name="editOrClone" value="Toiminto">
-				<node name="edit" value="Uudelleennimeä merkki"/>
-				<node name="clone" value="Kloonaa merkki"/>
+				<node name="edit" value="Uudelleennimeä luokka" />
+				<node name="clone" value="Kloonaa luokka" />
 			</node>
-			<node name="name" value="Merkin nimi"/>
-			<node name="includeSubtags" value="Sisällytä alamerkit"/>
+			<node name="name" value="Luokan nimi" />
+			<node name="includeSubtags" value="Sisällytä alaluokat" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Poista kirja"/>
-			<node name="message" value="Poista &#13;&quot;%s&quot;&#13; kirjastosta?"/>
+			<node name="title" value="Poista kirja" />
+			<node name="message" value="Poista&#10;&quot;%s&quot;&#10;kirjastosta?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Poista merkki"/>
-			<node name="message" value="Poista merkki &#8220;%s&#8221;?"/>
+			<node name="title" value="Poista luokka" />
+			<node name="message" value="Poista luokka “%s”?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Virhe"/>
-			<node name="message" value="Ei voitu avata:&#13;%s"/>
+			<node name="title" value="Virhe" />
+			<node name="message" value="Ei voitu avata:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Virhe"/>
-			<node name="message" value="Ohjetiedostoa ei löytynyt"/>
+			<node name="title" value="Virhe" />
+			<node name="message" value="Ohjetiedostoa ei löytynyt" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Virhe"/>
-			<node name="message" value="Merkin nimi ei saa olla tyhjä merkkijono"/>
+			<node name="title" value="Virhe" />
+			<node name="message" value="Luokan nimi ei saa olla tyhjä merkkijono" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Virhe"/>
-			<node name="message" value="Merkin nimi ei saa sisältää &#8220;,&#8221; symbolia"/>
+			<node name="title" value="Virhe" />
+			<node name="message" value="Luokan nimi ei saa sisältää “,” symbolia" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Tyhjä kirjastolista" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Virhe latauksessa" />
+			<node name="message" value="Kirjaa ei voida ladata tällähekellä" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Avataan kirjaa..."/>
-			<node name="loadingBookList" value="Avataan kirjalistaa..."/>
-			<node name="migrate" value="Päivitetään uuteen versioon. Olehyvä ja odota..."/>
+			<node name="loadingBook" value="Avataan kirjaa..." />
+			<node name="loadingBookList" value="Avataan kirjalistaa..." />
+			<node name="migrate" value="Päivitetään uuteen versioon. Ole hyvä ja odota..." />
+			<node name="downloadBookList" value="Ladataan kirjalistaa. Odota..." />
+			<node name="downloadBook" value="Ladataan kirjaa. Odota..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="Perustekstille"/>
-		<node name="Regular Paragraph" value="Normaalille kappaleelle"/>
-		<node name="Title" value="Otsikolle"/>
-		<node name="Section Title" value="Valinnan otsikolle"/>
-		<node name="Poem Title" value="Runon otsikolle"/>
-		<node name="Subtitle" value="Alaotsikolle"/>
-		<node name="Annotation" value="Huomautukselle"/>
-		<node name="Epigraph" value="Epigraphille"/>
-		<node name="Stanza" value="Säkeistölle"/>
-		<node name="Verse" value="Jakeelle"/>
-		<node name="Preformatted text" value="Esimuotoillulle tekstille"/>
-		<node name="Image" value="Kuvalle"/>
-		<node name="Cite" value="Lainaukselle"/>
-		<node name="Author" value="Tekijälle"/>
-		<node name="Date" value="Päivämäärälle"/>
-		<node name="Internal Hyperlink" value="Sisäiselle linkille"/>
-		<node name="Footnote" value="Alaviitteelle"/>
-		<node name="Emphasis" value="Korostukselle"/>
-		<node name="Strong" value="Vahvennetulle"/>
-		<node name="Subscript" value="Viitteelle"/>
-		<node name="Superscript" value="Yläviitteelle"/>
-		<node name="Code" value="Koodille"/>
-		<node name="StrikeThrough" value="Yliviivatulle"/>
-		<node name="Contents Table" value="Sisällysluettelolle"/>
-		<node name="Author in Library" value="Tekijälle kirjastossa"/>
-		<node name="Book in Library" value="Kirjalle kirjastossa"/>
-		<node name="Recent Book List" value="Viimeisimmät kirjat listalle"/>
-		<node name="Italic" value="Kursivoidulle"/>
-		<node name="Bold" value="Lihavoidulle"/>
-		<node name="Definition" value="Määrittelylle"/>
-		<node name="Definition Description" value="Määrittelyn kuvaukselle"/>
-		<node name="Header 1" value="Otsikolle 1"/>
-		<node name="Header 2" value="Otsikolle 2"/>
-		<node name="Header 3" value="Otsikolle 3"/>
-		<node name="Header 4" value="Otsikolle 4"/>
-		<node name="Header 5" value="Otsikolle 5"/>
-		<node name="Header 6" value="Otsikolle 6"/>
-		<node name="External Hyperlink" value="Ulkoiselle linkille"/>
+		<node name="Base" value="Perustekstille" />
+		<node name="Regular Paragraph" value="Normaalille kappaleelle" />
+		<node name="Title" value="Otsikolle" />
+		<node name="Section Title" value="Valinnan otsikolle" />
+		<node name="Poem Title" value="Runon otsikolle" />
+		<node name="Subtitle" value="Alaotsikolle" />
+		<node name="Annotation" value="Huomautukselle" />
+		<node name="Epigraph" value="Epigraphille" />
+		<node name="Stanza" value="Säkeistölle" />
+		<node name="Verse" value="Jakeelle" />
+		<node name="Preformatted text" value="Esimuotoillulle tekstille" />
+		<node name="Image" value="Kuvalle" />
+		<node name="Cite" value="Lainaukselle" />
+		<node name="Author" value="Tekijälle" />
+		<node name="Date" value="Päivämäärälle" />
+		<node name="Internal Hyperlink" value="Sisäiselle linkille" />
+		<node name="Footnote" value="Alaviitteelle" />
+		<node name="Emphasis" value="Korostukselle" />
+		<node name="Strong" value="Vahvennetulle" />
+		<node name="Subscript" value="Viitteelle" />
+		<node name="Superscript" value="Yläviitteelle" />
+		<node name="Code" value="Koodille" />
+		<node name="StrikeThrough" value="Yliviivatulle" />
+		<node name="Contents Table" value="Sisällysluettelolle" />
+		<node name="Library Entry" value="Kirjaston merkinnälle" />
+		<node name="Recent Book List" value="Viimeisimmät kirjat listalle" />
+		<node name="Italic" value="Kursivoidulle" />
+		<node name="Bold" value="Lihavoidulle" />
+		<node name="Definition" value="Määrittelylle" />
+		<node name="Definition Description" value="Määrittelyn kuvaukselle" />
+		<node name="Header 1" value="Otsikolle 1" />
+		<node name="Header 2" value="Otsikolle 2" />
+		<node name="Header 3" value="Otsikolle 3" />
+		<node name="Header 4" value="Otsikolle 4" />
+		<node name="Header 5" value="Otsikolle 5" />
+		<node name="Header 6" value="Otsikolle 6" />
+		<node name="External Hyperlink" value="Ulkoiselle linkille" />
+		<node name="Link to Another Book" value="Linkille " />
 	</node>
 	<node name="external">
-		<node name="browser" value="Selain"/>
-		<node name="defaultBrowser" value="Oletusselain"/>
+		<node name="browser" value="Selain" />
+		<node name="defaultBrowser" value="Oletusselain" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="Tuntematon virhe"/>
-		<node name="unsupportedCompressionMethod" value="Tiivistysmuodolle ei tukea"/>
-		<node name="encriptedFile" value="Digitaalisesti suojattu tiedosto"/>
+		<node name="unknown" value="Tuntematon virhe" />
+		<node name="unsupportedCompressionMethod" value="Tiivistysmuodolle ei tukea" />
+		<node name="encriptedFile" value="Digitaalisesti suojattu tiedosto" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Verkkokirjasto" />
+		<node name="startText" value="Syötä hakuehdot tekstikenttään ja paina &lt;Enter&gt;." />
+		<node name="notFound" value="Hakuehtojen mukaisia kirjoja ei löytynyt." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Kirjasto"/>
-		<node name="allBooks" value="Kaikki kirjat"/>
-		<node name="booksWithoutTags" value="Kirjat ilman merkkejä"/>
-		<node name="noBooks" value="FBReader ei löytänyt kirjoja määritellyistä sijainneista. Määrittele polku e-kirjastoosi Asetukset valintaikkunan (&#8220;Kirjasto&#8221; välilehdellä, &#8220;Kirjaston polku&#8221; kohdassa). Vaihtoehtoisesti voit lisätä kirjoja kirjastoosi käyttämällä &#8220;ALisää kirja&#8221; nappia."/>
+		<node name="caption" value="Kirjasto" />
+		<node name="allBooks" value="Kaikki kirjat" />
+		<node name="booksWithoutTags" value="Kirjat ilman luokkaa" />
+		<node name="noBooks" value="FBReader ei löytänyt kirjoja määritellyistä sijainneista. Määrittele polku e-kirjastoosi Asetukset valintaikkunan (“Kirjasto” välilehdellä, “Kirjaston polku” kohdassa). Vaihtoehtoisesti voit lisätä kirjoja kirjastoosi käyttämällä “Lisää kirja” nappia." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/fr.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/fr.xml
--- fbreader-0.8.17/fbreader/data/resources/fr.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/fr.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,377 +2,422 @@
 <!-- French FBReader resources, by Pierre Senellart -->
 <resources>
 	<node name="menu">
-		<node name="bookInfo" value="Informations sur le livre..."/>
-		<node name="toc" value="Table des matières"/>
+		<node name="bookInfo" value="Informations sur le livre..." />
+		<node name="toc" value="Table des matières" />
 		<node name="library" value="Bibliothèque">
-			<node name="showLibrary" value="Ouvrir"/>
-			<node name="previousBook" value="Livre précédent"/>
-			<node name="showRecent" value="Récents"/>
-			<node name="addBook" value="Ajouter un livre..."/>
-			<node name="showHelp" value="À propos de FBReader"/>
+			<node name="showLibrary" value="Ouvrir" />
+			<node name="previousBook" value="Livre précédent" />
+			<node name="showRecent" value="Récents" />
+			<node name="addBook" value="Ajouter un livre..." />
+			<node name="showHelp" value="À propos de FBReader" />
 		</node>
 		<node name="navigate" value="Navigation">
-			<node name="gotoHome" value="Aller au début du document"/>
-			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
-			<node name="gotoSectionStart" value="Aller au début de la section"/>
-			<node name="gotoSectionEnd" value="Aller à la fin de la section"/>
-			<node name="nextTOCSection" value="Aller à l'entrée suivante de la TDM"/>
-			<node name="previousTOCSection" value="Aller à l'entrée précédente de la TDM"/>
-			<node name="undo" value="Précédent"/>
-			<node name="redo" value="Suivant"/>
+			<node name="gotoHome" value="Aller au début du document" />
+			<node name="gotoPageNumber" value="Aller page..." />
+			<node name="gotoSectionStart" value="Aller au début de la section" />
+			<node name="gotoSectionEnd" value="Aller à la fin de la section" />
+			<node name="nextTOCSection" value="Aller à l&apos;entrée suivante de la TDM" />
+			<node name="previousTOCSection" value="Aller à l&apos;entrée précédente de la TDM" />
+			<node name="undo" value="Précédent" />
+			<node name="redo" value="Suivant" />
 		</node>
 		<node name="selection" value="Sélection">
-			<node name="copyToClipboard" value="Copier dans le presse-papier"/>
-			<node name="openInDictionary" value="Ouvrir dans le dictionnaire"/>
-			<node name="clearSelection" value="Effacer"/>
+			<node name="copyToClipboard" value="Copier dans le presse-papier" />
+			<node name="openInDictionary" value="Ouvrir dans le dictionnaire" />
+			<node name="clearSelection" value="Effacer" />
 		</node>
 		<node name="search" value="Recherche">
-			<node name="search" value="Rechercher le texte..."/>
-			<node name="findNext" value="Rechercher suivant"/>
-			<node name="findPrevious" value="Rechercher précédent"/>
+			<node name="search" value="Rechercher le texte..." />
+			<node name="findNext" value="Rechercher suivant" />
+			<node name="findPrevious" value="Rechercher précédent" />
 		</node>
 		<node name="view" value="Affichage">
-			<node name="rotate" value="Tourner l'écran"/>
-			<node name="toggleFullscreen" value="Plein écran"/>
-												<node name="toggleIndicator" value="Afficher/Masquer l'indicateur"/>
+			<node name="rotate" value="Tourner l&apos;écran" />
+			<node name="toggleFullscreen" value="Plein écran" />
+			<node name="toggleIndicator" value="Afficher/Masquer l&apos;indicateur" />
 		</node>
-		<node name="preferences" value="Préférences..."/>
-		<node name="quit" value="Fermer"/>
+		<node name="preferences" value="Préférences..." />
+		<node name="quit" value="Fermer" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Afficher l'arbre de la bibliothèque"/>
-		<node name="showRecent" value="Afficher la liste des livres récents"/>
-		<node name="addBook" value="Ajouter un livre à la bibliothèque"/>
-		<node name="gotoHome" value="Aller au début du texte"/>
-		<node name="undo" value="Précédent"/>
-		<node name="redo" value="Suivant"/>
-		<node name="toc" value="Table des matières"/>
-		<node name="search" value="Rechercher"/>
-		<node name="findNext" value="Rechercher suivant"/>
-		<node name="findPrevious" value="Rechercher précédent"/>
-		<node name="bookInfo" value="Afficher les informations sur le livre"/>
-		<node name="preferences" value="Afficher les préférences"/>
-		<node name="rotate" value="Tourner l'écran"/>
-		<node name="showHelp" value="À propos de FBReader"/>
+		<node name="showReading" value="Afficher le mode de lecture" />
+		<node name="showLibrary" value="Afficher l&apos;arbre de la bibliothèque">
+			<node name="popup" value="Afficher la liste des livres récents" />
+		</node>
+		<node name="showRecent" value="Afficher la liste des livres récents" />
+		<node name="byAuthor" value="Classer les livres par auteur" />
+		<node name="byTag" value="Classer les livres par tag" />
+		<node name="addBook" value="Ajouter un livre à la bibliothèque" />
+		<node name="showNetLibrary" value="Recherche dans bibliothèques réseau" />
+		<node name="searchOnNetwork" value="Recherche réseau" />
+		<node name="advancedSearchOnNetwork" value="Recherche réseau avancée" />
+		<node name="gotoHome" value="Aller au début du texte" />
+		<node name="undo" value="Précédent" />
+		<node name="redo" value="Suivant" />
+		<node name="gotoPageNumberWithParameter" value="Aller page" />
+		<node name="toc" value="Table des matières" />
+		<node name="search" value="Rechercher" />
+		<node name="findNext" value="Rechercher suivant" />
+		<node name="findPrevious" value="Rechercher précédent" />
+		<node name="bookInfo" value="Afficher les informations sur le livre" />
+		<node name="preferences" value="Afficher les préférences" />
+		<node name="rotate" value="Tourner l&apos;écran" />
+		<node name="showHelp" value="À propos de FBReader" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="O&amp;k"/>
-			<node name="thisOnly" value="This only" toBeTranslated="true"/>
-			<node name="withSubtags" value="With subtags" toBeTranslated="true"/>
+			<node name="go" value="O&amp;k" />
+			<node name="thisOnly" value="Seulement ceci" />
+			<node name="withSubtags" value="Sous-tags compris" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Options"/>
+			<node name="title" value="FBReader - Options" />
 			<node name="tab">
 				<node name="Library" value="Bibliothèque">
-					<node name="bookPath" value="Chemin des livres"/>
-					<node name="lookInSubdirectories" value="Chercher des livres dans les sous-répertoires"/>
-					<node name="recentListSize" value="Taille de la liste de livres récents"/>
-					<node name="showTags" value="Show Tag Hierarchies" toBeTranslated="true"/>
-					<node name="showAllBooksList" value="Show All Books Branch" toBeTranslated="true"/>
+					<node name="bookPath" value="Chemin des livres" />
+					<node name="lookInSubdirectories" value="Chercher des livres dans les sous-répertoires" />
+					<node name="collectBooksWithoutMetaInfo" value="Rassembler les livres sans métainformation" />
+					<node name="downloadDirectory" value="Répertoire des livres téléchargés" />
+					<node name="showAllBooksTag" value="Branche “Tous les livres” dans l&apos;arbre" />
+				</node>
+				<node name="NetworkLibrary" value="Recherche réseau">
+					<node name="useProxy" value="Utiliser un proxy" />
+					<node name="proxyHost" value="Serveur proxy" />
+					<node name="proxyPort" value="Port du proxy" />
+					<node name="timeout" value="Délai réseau maximal, secondes" />
 				</node>
 				<node name="Language" value="Langue">
-					<node name="autoDetect" value="Detecter la langue et l'encodage automatiquement"/>
-					<node name="defaultLanguage" value="Langue par défaut "/>
-					<node name="defaultEncodingSet" value="Ensemble d'encodages par défaut"/>
-					<node name="defaultEncoding" value="Encodage par défaut"/>
-					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1" toBeTranslated="true"/>
+					<node name="autoDetect" value="Detecter la langue et l&apos;encodage automatiquement" />
+					<node name="defaultLanguage" value="Langue par défaut " />
+					<node name="defaultEncodingSet" value="Ensemble d&apos;encodages par défaut" />
+					<node name="defaultEncoding" value="Encodage par défaut" />
+					<node name="useWindows1252Hack" value="Utiliser windows-1252 au lieu de iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Indicateur">
-					<node name="show" value="Montrer l'indicateur de position"/>
-					<node name="height" value="Hauteur de l'indicateur"/>
-					<node name="offset" value="Décalage par rapport au texte"/>
-					<node name="pageNumber" value="Montrer les numéros de page"/>
-					<node name="time" value="Afficher l'heure"/>
-					<node name="fontSize" value="Taille de la police"/>
-					<node name="tocMarks" value="Afficher les marques de la TDM"/>
-					<node name="navigation" value="Autoriser la navigation"/>
+					<node name="type" value="Afficher comme">
+						<node name="osScrollbar" value="Barre de défilement" />
+						<node name="fbIndicator" value="Indicateur ancien style" />
+						<node name="none" value="Ne pas afficher" />
+					</node>
+					<node name="height" value="Hauteur de l&apos;indicateur" />
+					<node name="offset" value="Décalage par rapport au texte" />
+					<node name="pageNumber" value="Montrer les numéros de page" />
+					<node name="time" value="Afficher l&apos;heure" />
+					<node name="fontSize" value="Taille de la police" />
+					<node name="tocMarks" value="Afficher les marques de la TDM" />
+					<node name="navigation" value="Autoriser la navigation" />
 				</node>
 				<node name="Scrolling" value="Défilement">
 					<node name="optionsFor" value="Options pour">
-						<node name="large" value="Grands défilements"/>
-						<node name="small" value="Petits défilements"/>
-						<node name="mouse" value="Défilements à la souris"/>
-						<node name="tap" value="Tap Scrollings" toBeTranslated="true"/>
+						<node name="large" value="Grands défilements" />
+						<node name="small" value="Petits défilements" />
+						<node name="mouse" value="Défilements à la souris" />
+						<node name="tap" value="Défilements tactiles" />
 					</node>
-					<node name="delay" value="Délai entre défilements, ms"/>
+					<node name="delay" value="Délai entre défilements, ms" />
 					<node name="mode" value="Mode de défilement">
-						<node name="noOverlapping" value="Pas de recouvrement"/>
-						<node name="keepLines" value="Conserver des lignes"/>
-						<node name="scrollLines" value="Défiler des lignes"/>
-						<node name="scrollPercentage" value="Défiler selon un pourcentage"/>
-						<node name="disable" value="Désactiver"/>
+						<node name="noOverlapping" value="Pas de recouvrement" />
+						<node name="keepLines" value="Conserver des lignes" />
+						<node name="scrollLines" value="Défiler des lignes" />
+						<node name="scrollPercentage" value="Défiler selon un pourcentage" />
+						<node name="disable" value="Désactiver" />
 					</node>
-					<node name="linesToKeep" value="Lignes à conserver"/>
-					<node name="linesToScroll" value="Lignes à défiler"/>
-					<node name="percentToScroll" value="Pourcentage à défiler"/>
-					<node name="fingerOnly" value="Scroll on Finger Tap Only" toBeTranslated="true"/>
+					<node name="linesToKeep" value="Lignes à conserver" />
+					<node name="linesToScroll" value="Lignes à défiler" />
+					<node name="percentToScroll" value="Pourcentage à défiler" />
+					<node name="fingerOnly" value="Défiler seulement avec le doigt" />
 				</node>
 				<node name="Selection" value="Sélection">
-					<node name="enableSelection" value="Enable Text Selection" toBeTranslated="true"/>
+					<node name="enableSelection" value="Activer la sélection de texte" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Toujours utiliser mes propres polices" />
 				</node>
 				<node name="Margins" value="Marges">
-					<node name="left" value="Marge gauche"/>
-					<node name="right" value="Marge droite"/>
-					<node name="top" value="Marge haut"/>
-					<node name="bottom" value="Marge bas"/>
+					<node name="left" value="Marge gauche" />
+					<node name="right" value="Marge droite" />
+					<node name="top" value="Marge haut" />
+					<node name="bottom" value="Marge bas" />
 				</node>
 				<node name="Format" value="Format">
-					<node name="optionsFor" value="Options pour"/>
+					<node name="optionsFor" value="Options pour" />
 					<node name="lineSpacing" value="Interligne">
-						<node name="inchangé" value="&lt;inchangé&gt;"/>
+						<node name="unchanged" value="&lt;inchangé&gt;" />
 					</node>
-					<node name="firstLineIndent" value="Alinéa"/>
+					<node name="firstLineIndent" value="Alinéa" />
 					<node name="alignment" value="Alignement">
-						<node name="left" value="Gauche"/>
-						<node name="right" value="Droite"/>
-						<node name="center" value="Centré"/>
-						<node name="justify" value="Justifié"/>
-						<node name="inchangé" value="&lt;inchangé&gt;"/>
+						<node name="left" value="Gauche" />
+						<node name="right" value="Droite" />
+						<node name="center" value="Centré" />
+						<node name="justify" value="Justifié" />
+						<node name="unchanged" value="&lt;inchangé&gt;" />
 					</node>
-					<node name="spaceBefore" value="Espace avant"/>
-					<node name="spaceAfter" value="Espace après"/>
-					<node name="leftIndent" value="Indentation gauche"/>
-					<node name="rightIndent" value="Indentation droite"/>
+					<node name="spaceBefore" value="Espace avant" />
+					<node name="spaceAfter" value="Espace après" />
+					<node name="startIndent" value="Retrait de début de ligne" />
+					<node name="endIndent" value="Retrait de fin de ligne" />
 				</node>
 				<node name="Styles" value="Styles">
-					<node name="optionsFor" value="Options pour"/>
+					<node name="optionsFor" value="Options pour" />
 					<node name="fontFamily" value="Famille">
-						<node name="inchangée" value="&lt;unchanged&gt;"/>
+						<node name="unchanged" value="&lt;inchangé&gt;" />
 					</node>
-					<node name="fontSize" value="Taille"/>
-					<node name="fontSizeDifference" value="Différence de taille"/>
-					<node name="bold" value="Gras"/>
-					<node name="italic" value="Italique"/>
-					<node name="allowHyphenations" value="Autoriser la césure"/>
-					<node name="autoHyphenations" value="Césure automatique"/>
+					<node name="fontSize" value="Taille" />
+					<node name="fontSizeDifference" value="Différence de taille" />
+					<node name="bold" value="Gras" />
+					<node name="italic" value="Italique" />
+					<node name="allowHyphenations" value="Autoriser la césure" />
+					<node name="autoHyphenations" value="Césure automatique" />
 				</node>
 				<node name="Rotation" value="Rotation">
 					<node name="direction" value="Type de rotation">
-						<node name="disabled" value="Désactivée"/>
-						<node name="clockwise" value="90° (sens des aiguilles)"/>
-						<node name="counterclockwise" value="90° (sens inverse des aiguilles)"/>
-						<node name="180" value="180°"/>
-						<node name="cycle" value="Parcourt les 4 directions"/>
+						<node name="disabled" value="Désactivée" />
+						<node name="clockwise" value="90° (sens des aiguilles)" />
+						<node name="counterclockwise" value="90° (sens inverse des aiguilles)" />
+						<node name="180" value="180°" />
+						<node name="cycle" value="Parcourt les 4 directions" />
 					</node>
 				</node>
 				<node name="Colors" value="Couleurs">
 					<node name="colorFor" value="Couleur pour">
-						<node name="background" value="Arrière-plan"/>
-						<node name="selectionBackground" value="Arrière-plan de la sélection"/>
-						<node name="text" value="Texte normal"/>
-						<node name="internalLink" value="Hyperlien interne"/>
-						<node name="externalLink" value="Hyperlien externe"/>
-						<node name="highlighted" value="Texte mis en valeur"/>
-						<node name="treeLines" value="Lignes de l'arbre"/>
-						<node name="indicator" value="Indicateur de position"/>
+						<node name="background" value="Arrière-plan" />
+						<node name="selectionBackground" value="Arrière-plan de la sélection" />
+						<node name="text" value="Texte normal" />
+						<node name="internalLink" value="Hyperlien interne" />
+						<node name="externalLink" value="Hyperlien externe" />
+						<node name="bookLink" value="Lien vers un autre livre" />
+						<node name="highlighted" value="Texte mis en valeur" />
+						<node name="treeLines" value="Lignes de l&apos;arbre" />
+						<node name="indicator" value="Indicateur de position" />
 					</node>
 				</node>
 				<node name="Keys" value="Touches">
-					<node name="grabSystemKeys" value="Capturer les touches systèmes"/>
-					<node name="separate" value="Les touches dépendent de l'orientation"/>
-					<node name="orientation" value="Orientation"/>
+					<node name="grabSystemKeys" value="Capturer les touches systèmes" />
+					<node name="separate" value="Les touches dépendent de l&apos;orientation" />
+					<node name="orientation" value="Orientation" />
 					<node name="action">
-						<node name="none" value="Aucune"/>
-						<node name="showLibrary" value="Afficher la bibliothèque"/>
-						<node name="showRecent" value="Afficher les livres récents"/>
-						<node name="previousBook" value="Ouvrir le livre précédent"/>
-						<node name="toc" value="Afficher la table des matières"/>
-						<node name="gotoHome" value="Aller au début"/>
-						<node name="gotoSectionStart" value="Aller au début de la section"/>
-						<node name="gotoSectionEnd" value="Aller à la fin de la section"/>
-						<node name="nextTOCSection" value="Aller à la section précédente de la TDM"/>
-						<node name="previousTOCSection" value="Aller à la section suivante de la TDM"/>
-						<node name="largeScrollForward" value="Grand défilement vers le bas"/>
-						<node name="largeScrollBackward" value="Grand défilement vers le haut"/>
-						<node name="smallScrollForward" value="Petit défilement vers le bas"/>
-						<node name="smallScrollBackward" value="Petit défilement vers le haut"/>
-						<node name="undo" value="Annuler"/>
-						<node name="redo" value="Restaurer"/>
-						<node name="copyToClipboard" value="Copier la sélection dans le presse-papier"/>
-						<node name="openInDictionary" value="Ouvrir la sélection dans le dictionnaire"/>
-						<node name="clearSelection" value="Effacer la sélection"/>
-						<node name="search" value="Rechercher"/>
-						<node name="findPrevious" value="Rechercher précédent"/>
-						<node name="findNext" value="Rechercher suivant"/>
-						<node name="increaseFont" value="Augmenter la taille de la police"/>
-						<node name="decreaseFont" value="Réduire la taille de la police"/>
-						<node name="toggleIndicator" value="Afficher/Masquer l'indicateur"/>
-						<node name="toggleFullscreen" value="Activer/Désactiver le plein écran"/>
-						<node name="onFullscreen" value="Plein écran"/>
-						<node name="rotate" value="Tourner l'écran"/>
-						<node name="preferences" value="Afficher les options"/>
-						<node name="bookInfo" value="Afficher les informations sur le livre"/>
-						<node name="addBook" value="Ajouter un livre"/>
-						<node name="cancel" value="Annuler"/>
-						<node name="quit" value="Quitter"/>
+						<node name="none" value="Aucune" />
+						<node name="showLibrary" value="Afficher la bibliothèque" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="Afficher les livres récents" />
+						<node name="previousBook" value="Ouvrir le livre précédent" />
+						<node name="toc" value="Afficher la table des matières" />
+						<node name="gotoHome" value="Aller au début" />
+						<node name="gotoSectionStart" value="Aller au début de la section" />
+						<node name="gotoSectionEnd" value="Aller à la fin de la section" />
+						<node name="nextTOCSection" value="Aller à la section précédente de la TDM" />
+						<node name="previousTOCSection" value="Aller à la section suivante de la TDM" />
+						<node name="largeScrollForward" value="Grand défilement vers le bas" />
+						<node name="largeScrollBackward" value="Grand défilement vers le haut" />
+						<node name="smallScrollForward" value="Petit défilement vers le bas" />
+						<node name="smallScrollBackward" value="Petit défilement vers le haut" />
+						<node name="undo" value="Annuler" />
+						<node name="redo" value="Restaurer" />
+						<node name="copyToClipboard" value="Copier la sélection dans le presse-papier" />
+						<node name="openInDictionary" value="Ouvrir la sélection dans le dictionnaire" />
+						<node name="clearSelection" value="Effacer la sélection" />
+						<node name="search" value="Rechercher" />
+						<node name="findPrevious" value="Rechercher précédent" />
+						<node name="findNext" value="Rechercher suivant" />
+						<node name="increaseFont" value="Augmenter la taille de la police" />
+						<node name="decreaseFont" value="Réduire la taille de la police" />
+						<node name="toggleIndicator" value="Afficher/Masquer l&apos;indicateur" />
+						<node name="toggleFullscreen" value="Activer/Désactiver le plein écran" />
+						<node name="rotate" value="Tourner l&apos;écran" />
+						<node name="preferences" value="Afficher les préférences" />
+						<node name="bookInfo" value="Afficher les informations sur le livre" />
+						<node name="addBook" value="Ajouter un livre" />
+						<node name="cancel" value="Annuler" />
+						<node name="quit" value="Quitter" />
 					</node>
-					<node name="quitOnCancel" value="Quitter l'application lors d'une annulation"/>
-					<node name="keyDelay" value="Délai entre appui sur les touches"/>
+					<node name="quitOnCancel" value="Quitter l&apos;application lors d&apos;une annulation" />
+					<node name="keyDelay" value="Délai entre appui sur les touches" />
 				</node>
 				<node name="Config" value="Configuration">
-					<node name="autoSave" value="Enregistrer l'état automatiquement"/>
-					<node name="timeout" value="Délai entre les enregistrements en secondes"/>
+					<node name="autoSave" value="Enregistrer l&apos;état automatiquement" />
+					<node name="timeout" value="Délai entre les enregistrements en secondes" />
 				</node>
 				<node name="Dictionary" value="Dictionnaire">
-					<node name="enableIntegration" value="Activer l'intégration avec %s"/>
-					<node name="defaultText" value="Activer l'intégration avec le dictionnaire"/>
-					<node name="choice" value="Intégration avec"/>
-					<node name="singleClickOpen" value="Ouvrir avec un simple clic"/>
+					<node name="enableIntegration" value="Activer l&apos;intégration avec %s" />
+					<node name="defaultText" value="Activer l&apos;intégration avec le dictionnaire" />
+					<node name="choice" value="Intégration avec" />
+					<node name="singleClickOpen" value="Ouvrir avec un simple clic" />
 				</node>
 				<node name="Web" value="Web">
-					<node name="enableIntegration" value="Ouvrir les liens externes dans %s"/>
-					<node name="defaultText" value="Ouvrir les liens externes dans le navigateur"/>
-					<node name="choice" value="Utiliser le navigateur"/>
-					<node name="command" value="Commande à exécuter"/>
+					<node name="enableIntegration" value="Ouvrir les liens externes dans %s" />
+					<node name="defaultText" value="Ouvrir les liens externes dans le navigateur" />
+					<node name="choice" value="Utiliser le navigateur" />
+					<node name="command" value="Commande à exécuter" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press" toBeTranslated="true"/>
-					<node name="minStylusPressure" value="Minimal Stylus Pressure" toBeTranslated="true"/>
-					<node name="maxStylusPressure" value="Maximal Stylus Pressure" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Action au relâchement de la touche, pas à l&apos;appui" />
+					<node name="minStylusPressure" value="Pression minimale du stylet" />
+					<node name="maxStylusPressure" value="Pression maximale du stylet" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informations sur le livre"/>
+			<node name="title" value="FBReader - Informations sur le livre" />
 			<node name="tab">
 				<node name="Common" value="Général">
-					<node name="file" value="Fichier"/>
-					<node name="title" value="Titre"/>
-					<node name="authorDisplayName" value="Auteur (nom affiché)"/>
-					<node name="authorSortKey" value="Auteur (clef de tri)"/>
-					<node name="language" value="Langue"/>
-					<node name="encodingSet" value="Ensemble d'encodages"/>
-					<node name="encoding" value="Encodage"/>
+					<node name="file" value="Fichier" />
+					<node name="title" value="Titre" />
+					<node name="authorDisplayName" value="Auteur (nom affiché)" />
+					<node name="authorSortKey" value="Auteur (clef de tri)" />
+					<node name="language" value="Langue" />
+					<node name="encodingSet" value="Ensemble d&apos;encodages" />
+					<node name="encoding" value="Encodage" />
 				</node>
 				<node name="Series" value="Série">
-					<node name="seriesTitle" value="Titre de la série"/>
-					<node name="bookNumber" value="Numéro du livre"/>
+					<node name="seriesTitle" value="Titre de la série" />
+					<node name="bookNumber" value="Numéro du livre" />
 				</node>
-				<node name="Tags" value="Tags" toBeTranslated="true">
-					<node name="tags" value="Tag List" toBeTranslated="true"/>
+				<node name="Tags" value="Tags">
+					<node name="tags" value="Liste de tags" />
 				</node>
 				<node name="Text" value="Texte">
-					<node name="breakType" value="Fin des paragraphes"/>
-					<node name="ignoreIndent" value="Ignorer une indentation inférieure à"/>
-					<node name="buildTOC" value="Construire la table des matières"/>
-					<node name="emptyLines" value="Lignes vides avant une nouvelle section"/>
+					<node name="breakType" value="Fin des paragraphes" />
+					<node name="ignoreIndent" value="Ignorer une indentation inférieure à" />
+					<node name="buildTOC" value="Construire la table des matières" />
+					<node name="emptyLines" value="Lignes vides avant une nouvelle section" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Fin des paragraphes"/>
-					<node name="ignoreIndent" value="Ignorer une indentation inférieure à"/>
-					<node name="buildTOC" value="Construire la table des matières"/>
-					<node name="emptyLines" value="Lignes vides avant une novuelle section"/>
+					<node name="breakType" value="Fin des paragraphes" />
+					<node name="ignoreIndent" value="Ignorer une indentation inférieure à" />
+					<node name="buildTOC" value="Construire la table des matières" />
+					<node name="emptyLines" value="Lignes vides avant une novuelle section" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Ajouter un livre à la bibliothèque"/>
+			<node name="title" value="FBReader - Ajouter un livre à la bibliothèque" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Rechercher"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="&amp;Ignorer la casse"/>
-			<node name="wholeText" value="&amp;Dans tout le texte"/>
-			<node name="backward" value="&amp;Vers l'arrière"/>
-			<node name="currentSection" value="&amp;Cette section seulement"/>
+			<node name="title" value="Rechercher" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="&amp;Ignorer la casse" />
+			<node name="wholeText" value="&amp;Dans tout le texte" />
+			<node name="backward" value="&amp;Vers l&apos;arrière" />
+			<node name="currentSection" value="&amp;Cette section seulement" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Recherche réseau" />
+			<node name="bookTitle" value="Titre" />
+			<node name="author" value="Auteur" />
+			<node name="category" value="Catégorie" />
+			<node name="series" value="Série" />
+			<node name="description" value="Description" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Go To Page" toBeTranslated="true"/>
-			<node name="pageNumber" value="Go to Page Number" toBeTranslated="true"/>
+			<node name="title" value="Aller à la page" />
+			<node name="pageNumber" value="Aller page" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Edit/Clone Tag" toBeTranslated="true"/>
-			<node name="editOrClone" value="Action" toBeTranslated="true">
-				<node name="edit" value="Rename Tag" toBeTranslated="true"/>
-				<node name="clone" value="Clone Tag" toBeTranslated="true"/>
+			<node name="title" value="Éditer/Cloner un tag" />
+			<node name="editOrClone" value="Action">
+				<node name="edit" value="Renommer le tag" />
+				<node name="clone" value="Cloner le tag" />
 			</node>
-			<node name="name" value="Tag Name" toBeTranslated="true"/>
-			<node name="includeSubtags" value="Include Subtags" toBeTranslated="true"/>
+			<node name="name" value="Nom du tag" />
+			<node name="includeSubtags" value="Inclure les sous-tags" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Enlever un livre"/>
-			<node name="message" value="Enlever le livre &#13;&quot;%s&quot;&#13; de la bibliothèque ?"/>
+			<node name="title" value="Enlever un livre" />
+			<node name="message" value="Enlever le livre&#10;&quot;%s&quot;&#10;de la bibliothèque ?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Remove Tag" toBeTranslated="true"/>
-			<node name="message" value="Remove Tag &#8220;%s&#8221;?" toBeTranslated="true"/>
+			<node name="title" value="Enlever un tag" />
+			<node name="message" value="Enlever le tag “%s”?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Erreur"/>
-			<node name="message" value="Impossible d'ouvrir &#13;%s"/>
+			<node name="title" value="Erreur" />
+			<node name="message" value="Impossible d&apos;ouvrir&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Erreur"/>
-			<node name="message" value="Fichier d'aide non trouvé, désolé"/>
+			<node name="title" value="Erreur" />
+			<node name="message" value="Fichier d&apos;aide non trouvé, désolé" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Erreur"/>
-			<node name="message" value="Tag name must be a non-empty string" toBeTranslated="true"/>
+			<node name="title" value="Erreur" />
+			<node name="message" value="Le nom du tag ne peut être vide" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Erreur"/>
-			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol" toBeTranslated="true"/>
+			<node name="title" value="Erreur" />
+			<node name="message" value="Le nom du tag ne peut contenir un symbole “,”" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Liste de bibliothèques vide" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Erreur de téléchargement" />
+			<node name="message" value="Impossible de télécharger ce livre en ce moment" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Chargement du livre. Veuillez patienter..."/>
-			<node name="loadingBookList" value="Chargement de la liste des livres. Veuillez patienter..."/>
-			<node name="migrate" value="Upgrading to the new version. Please, wait..." toBeTranslated="true"/>
+			<node name="loadingBook" value="Chargement du livre. Veuillez patienter..." />
+			<node name="loadingBookList" value="Chargement de la liste des livres. Veuillez patienter..." />
+			<node name="migrate" value="Mise à jour en cours. Veuillez patienter..." />
+			<node name="downloadBookList" value="Téléchargement de la liste de livres en cours. Veuillez patienter..." />
+			<node name="downloadBook" value="Téléchargement du livre. Veuillez patienter..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="Base"/>
-		<node name="Regular Paragraph" value="Paragraphe normal"/>
-		<node name="Title" value="Titre"/>
-		<node name="Section Title" value="Titre de section"/>
-		<node name="Poem Title" value="Titre de poème"/>
-		<node name="Subtitle" value="Sous-titre"/>
-		<node name="Annotation" value="Annotation"/>
-		<node name="Epigraph" value="Épigraphe"/>
-		<node name="Stanza" value="Strophe"/>
-		<node name="Verse" value="Vers"/>
-		<node name="Preformatted text" value="Texte préformatté"/>
-		<node name="Image" value="Image"/>
-		<node name="Cite" value="Citation"/>
-		<node name="Author" value="Auteur"/>
-		<node name="Date" value="Date"/>
-		<node name="Internal Hyperlink" value="Hyperlien interne"/>
-		<node name="Footnote" value="Note de bas de page"/>
-		<node name="Emphasis" value="Emphase"/>
-		<node name="Strong" value="Forte emphase"/>
-		<node name="Subscript" value="Indice"/>
-		<node name="Superscript" value="Exposant"/>
-		<node name="Code" value="Code"/>
-		<node name="StrikeThrough" value="Barré"/>
-		<node name="Contents Table" value="Table des matières"/>
-		<node name="Author in Library" value="Auteur dans la bibliothèque"/>
-		<node name="Book in Library" value="Livre dans la bibliothèque"/>
-		<node name="Recent Book List" value="Liste des livres récents"/>
-		<node name="Italic" value="Italique"/>
-		<node name="Bold" value="Gras"/>
-		<node name="Definition" value="Définition"/>
-		<node name="Definition Description" value="Contenu de la définition"/>
-		<node name="Header 1" value="En-tête 1"/>
-		<node name="Header 2" value="En-tête 2"/>
-		<node name="Header 3" value="En-tête 3"/>
-		<node name="Header 4" value="En-tête 4"/>
-		<node name="Header 5" value="En-tête 5"/>
-		<node name="Header 6" value="En-tête 6"/>
-		<node name="External Hyperlink" value="Hyperlien externe"/>
+		<node name="Base" value="Base" />
+		<node name="Regular Paragraph" value="Paragraphe normal" />
+		<node name="Title" value="Titre" />
+		<node name="Section Title" value="Titre de section" />
+		<node name="Poem Title" value="Titre de poème" />
+		<node name="Subtitle" value="Sous-titre" />
+		<node name="Annotation" value="Annotation" />
+		<node name="Epigraph" value="Épigraphe" />
+		<node name="Stanza" value="Strophe" />
+		<node name="Verse" value="Vers" />
+		<node name="Preformatted text" value="Texte préformatté" />
+		<node name="Image" value="Image" />
+		<node name="Cite" value="Citation" />
+		<node name="Author" value="Auteur" />
+		<node name="Date" value="Date" />
+		<node name="Internal Hyperlink" value="Hyperlien interne" />
+		<node name="Footnote" value="Note de bas de page" />
+		<node name="Emphasis" value="Emphase" />
+		<node name="Strong" value="Forte emphase" />
+		<node name="Subscript" value="Indice" />
+		<node name="Superscript" value="Exposant" />
+		<node name="Code" value="Code" />
+		<node name="StrikeThrough" value="Barré" />
+		<node name="Contents Table" value="Table des matières" />
+		<node name="Library Entry" value="Entrée de la bibliothèque" />
+		<node name="Recent Book List" value="Liste des livres récents" />
+		<node name="Italic" value="Italique" />
+		<node name="Bold" value="Gras" />
+		<node name="Definition" value="Définition" />
+		<node name="Definition Description" value="Contenu de la définition" />
+		<node name="Header 1" value="En-tête 1" />
+		<node name="Header 2" value="En-tête 2" />
+		<node name="Header 3" value="En-tête 3" />
+		<node name="Header 4" value="En-tête 4" />
+		<node name="Header 5" value="En-tête 5" />
+		<node name="Header 6" value="En-tête 6" />
+		<node name="External Hyperlink" value="Hyperlien externe" />
+		<node name="Link to Another Book" value="Lien vers un autre livre" />
 	</node>
 	<node name="external">
-		<node name="browser" value="Navigateur"/>
-		<node name="defaultBrowser" value="Navigateur par défaut"/>
+		<node name="browser" value="Navigateur" />
+		<node name="defaultBrowser" value="Navigateur par défaut" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="Erreur inconnue"/>
-		<node name="unsupportedCompressionMethod" value="Méthode de compression non supportée"/>
-		<node name="encriptedFile" value="Fichier protégé par MTP"/>
+		<node name="unknown" value="Erreur inconnue" />
+		<node name="unsupportedCompressionMethod" value="Méthode de compression non supportée" />
+		<node name="encriptedFile" value="Fichier protégé par MTP" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Bibliothèque réseau" />
+		<node name="startText" value="Veuillez entrer un motif de recherche dans le champ textuel de la barre d&apos;outils et presser &lt;Entrée&gt;." />
+		<node name="notFound" value="Désolé, aucun livre correspondant n&apos;a été trouvé." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Bibliothèque"/>
-		<node name="allBooks" value="All Books" toBeTranslated="true"/>
-		<node name="booksWithoutTags" value="Books with no Tags" toBeTranslated="true"/>
-		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button." toBeTranslated="true"/>
+		<node name="caption" value="Bibliothèque" />
+		<node name="allBooks" value="Tous les livres" />
+		<node name="booksWithoutTags" value="Livres sans tags" />
+		<node name="noBooks" value="FBReader n&apos;a pas trouvé de livres dans les emplacements configurés. Veuillez spécifier le chemin de vos livres dans la boîte de dialogue de préférences (onglet “Bibliothèque”, “Chemin des livres”). Vous pouvez également ajouter des livres à votre bibliothèque avec le bouton “Ajouter un livre”." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/id.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/id.xml
--- fbreader-0.8.17/fbreader/data/resources/id.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/id.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,423 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Indonesian FBReader resources, by Ketut Putu Kumajaya -->
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Informasi Buku..."/>
-	  <node name="toc" value="Daftar Isi"/>
+	<node name="menu">
+		<node name="bookInfo" value="Informasi Buku..." />
+		<node name="toc" value="Daftar Isi" />
 		<node name="library" value="Pustaka">
-			<node name="showLibrary" value="Buka"/>
-			<node name="previousBook" value="Buku Sebelumnya"/>
-			<node name="showRecent" value="Buku-buku Sebelumnya"/>
-			<node name="addBook" value="Tambah Buku..."/>
-			<node name="showHelp" value="Mengenai FBReader"/>
+			<node name="showLibrary" value="Buka" />
+			<node name="previousBook" value="Buku Sebelumnya" />
+			<node name="showRecent" value="Buku-buku Sebelumnya" />
+			<node name="addBook" value="Tambah Buku..." />
+			<node name="showHelp" value="Mengenai FBReader" />
 		</node>
 		<node name="navigate" value="Navigasi">
-			<node name="gotoHome" value="Ke Awal Dokumen"/>
-			<node name="gotoPageNumber" value="Ke Halaman..."/>
-			<node name="gotoSectionStart" value="Ke Bagian Awal Teks"/>
-			<node name="gotoSectionEnd" value="Ke Bagian Akhir Teks"/>
-			<node name="nextTOCSection" value="Ke Item Daftar Isi Berikutnya"/>
-			<node name="previousTOCSection" value="Ke Item Daftar Isi Sebelumnya"/>
-			<node name="undo" value="Mundur"/>
-			<node name="redo" value="Maju"/>
+			<node name="gotoHome" value="Ke Awal Dokumen" />
+			<node name="gotoPageNumber" value="Ke Halaman..." />
+			<node name="gotoSectionStart" value="Ke Bagian Awal Teks" />
+			<node name="gotoSectionEnd" value="Ke Bagian Akhir Teks" />
+			<node name="nextTOCSection" value="Ke Item Daftar Isi Berikutnya" />
+			<node name="previousTOCSection" value="Ke Item Daftar Isi Sebelumnya" />
+			<node name="undo" value="Mundur" />
+			<node name="redo" value="Maju" />
 		</node>
 		<node name="selection" value="Seleksi">
-			<node name="copyToClipboard" value="Salin ke Clipboard"/>
-			<node name="openInDictionary" value="Buka di Kamus"/>
-			<node name="clearSelection" value="Bersihkan"/>
+			<node name="copyToClipboard" value="Salin ke Clipboard" />
+			<node name="openInDictionary" value="Buka di Kamus" />
+			<node name="clearSelection" value="Bersihkan" />
 		</node>
 		<node name="search" value="Cari">
-			<node name="search" value="Pencarian Teks..."/>
-			<node name="findNext" value="Pencarian Maju"/>
-			<node name="findPrevious" value="Pencarian Mundur"/>
+			<node name="search" value="Pencarian Teks..." />
+			<node name="findNext" value="Pencarian Maju" />
+			<node name="findPrevious" value="Pencarian Mundur" />
 		</node>
 		<node name="view" value="Tampilan">
-			<node name="rotate" value="Putar Layar"/>
-			<node name="toggleFullscreen" value="Layar Penuh"/>
-			<node name="toggleIndicator" value="Hidup/Matikan Indikator"/>
+			<node name="rotate" value="Putar Layar" />
+			<node name="toggleFullscreen" value="Layar Penuh" />
+			<node name="toggleIndicator" value="Hidup/Matikan Indikator" />
 		</node>
-		<node name="preferences" value="Pengaturan..."/>
-		<node name="quit" value="Keluar"/>
+		<node name="preferences" value="Pengaturan..." />
+		<node name="quit" value="Keluar" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Perlihatkan Daftar Pustaka"/>
-		<node name="showRecent" value="Perlihatkan Daftar Buku-buku Sebelumnya"/>
-		<node name="addBook" value="Tambahkan Berkas ke Pustaka"/>
-		<node name="gotoHome" value="Ke Bagian Awal Teks"/>
-		<node name="undo" value="Mundur"/>
-		<node name="redo" value="Maju"/>
-		<node name="toc" value="Daftart Isi"/>
-		<node name="search" value="Pencarian Teks"/>
-		<node name="findNext" value="Pencarian Maju"/>
-		<node name="findPrevious" value="Pencarian Mundur"/>
-		<node name="bookInfo" value="Tampilkan Dialog Informasi Buku"/>
-		<node name="preferences" value="Tampilkan Dialog Pengaturan"/>
-		<node name="rotate" value="Putar Layar"/>
-		<node name="showHelp" value="Mengenai FBReader"/>
+		<node name="showReading" value="Tampilkan Mode Baca" />
+		<node name="showLibrary" value="Tampilkan Daftar Pustaka">
+			<node name="popup" value="Tampilkan Daftar Buku-buku Sebelumnya" />
+		</node>
+		<node name="showRecent" value="Tampilkan Daftar Buku-buku Sebelumnya" />
+		<node name="byAuthor" value="Atur Buku-buku berdasarkan Pengarang" />
+		<node name="byTag" value="Atur Buku-buku berdasarkan Tag" />
+		<node name="addBook" value="Tambahkan Berkas ke Pustaka" />
+		<node name="showNetLibrary" value="Cari dalam Pustaka Jaringan" />
+		<node name="searchOnNetwork" value="Pencarian dalam Jaringan" />
+		<node name="advancedSearchOnNetwork" value="Pencarian dalam Jaringan Tingkat Lanjut" />
+		<node name="gotoHome" value="Ke Bagian Awal Teks" />
+		<node name="undo" value="Mundur" />
+		<node name="redo" value="Maju" />
+		<node name="gotoPageNumberWithParameter" value="Ke Halaman" />
+		<node name="toc" value="Daftart Isi" />
+		<node name="search" value="Pencarian Teks" />
+		<node name="findNext" value="Pencarian Maju" />
+		<node name="findPrevious" value="Pencarian Mundur" />
+		<node name="bookInfo" value="Tampilkan Dialog Informasi Buku" />
+		<node name="preferences" value="Tampilkan Dialog Pengaturan" />
+		<node name="rotate" value="Putar Layar" />
+		<node name="showHelp" value="Mengenai FBReader" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Mulai!"/>
-			<node name="thisOnly" value="This only" toBeTranslated="true"/>
-			<node name="withSubtags" value="With subtags" toBeTranslated="true"/>
+			<node name="go" value="&amp;Mulai!" />
+			<node name="thisOnly" value="Hanya ini" />
+			<node name="withSubtags" value="Dengan subtag" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Pengaturan"/>
+			<node name="title" value="FBReader - Pengaturan" />
 			<node name="tab">
 				<node name="Library" value="Pustaka">
-					<node name="bookPath" value="Lokasi Buku"/>
-					<node name="lookInSubdirectories" value="Tampilkan Buku-buku yang Ada di Sub Direktori"/>
-					<node name="recentListSize" value="Jumlah Daftar Buku-buku yang dibuka sebelumnya"/>
-					<node name="showTags" value="Show Tag Hierarchies" toBeTranslated="true"/>
-					<node name="showAllBooksList" value="Show All Books Branch" toBeTranslated="true"/>
+					<node name="bookPath" value="Lokasi Buku" />
+					<node name="lookInSubdirectories" value="Tampilkan Buku-buku yang Ada di Sub Direktori" />
+					<node name="collectBooksWithoutMetaInfo" value="Kumpulkan Buku-buku tanpa MetaInfo" />
+					<node name="downloadDirectory" value="Direktori Buku-buku hasil Download" />
+					<node name="showAllBooksTag" value="Tampilkan Semua Cabang Buku" />
+				</node>
+				<node name="NetworkLibrary" value="Pencarian Jaringan">
+					<node name="useProxy" value="Gunakan Proxy" />
+					<node name="proxyHost" value="Alamat Proxy" />
+					<node name="proxyPort" value="Nomor Port Proxy" />
+					<node name="timeout" value="Waktu Tunggu Operasi Jaringan, detik" />
 				</node>
 				<node name="Language" value="Bahasa">
-					<node name="autoDetect" value="Deteksi Bahasa dan Enkode secara Otomatis"/>
-					<node name="defaultLanguage" value="Bahasa Standar"/>
-					<node name="defaultEncodingSet" value="Set Enkode Standar"/>
-					<node name="defaultEncoding" value="Enkode Standar"/>
-					<node name="useWindows1252Hack" value="Gunakan windows-1252 daripada iso-8859-1"/>
+					<node name="autoDetect" value="Deteksi Bahasa dan Enkode secara Otomatis" />
+					<node name="defaultLanguage" value="Bahasa Standar" />
+					<node name="defaultEncodingSet" value="Set Enkode Standar" />
+					<node name="defaultEncoding" value="Enkode Standar" />
+					<node name="useWindows1252Hack" value="Gunakan windows-1252 daripada iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Indikator">
-					<node name="show" value="Tampilkan Indikator Posisi"/>
-					<node name="height" value="Tinggi Indikator"/>
-					<node name="offset" value="Jarak dari Teks"/>
-					<node name="pageNumber" value="Tampilkan Posisi sebagai Nomor"/>
-					<node name="time" value="Tampilkan Waktu"/>
-					<node name="fontSize" value="Ukuran Huruf"/>
-					<node name="tocMarks" value="Tampilkan Penanda Daftar Isi"/>
-					<node name="navigation" value="Aktifkan Navigasi"/>
+					<node name="type" value="Tampilkan sebagai">
+						<node name="osScrollbar" value="Scrollbar OS" />
+						<node name="fbIndicator" value="Indikator Model Lama" />
+						<node name="none" value="Jangan Ditampilkan" />
+					</node>
+					<node name="height" value="Tinggi Indikator" />
+					<node name="offset" value="Jarak dari Teks" />
+					<node name="pageNumber" value="Tampilkan Posisi sebagai Nomor" />
+					<node name="time" value="Tampilkan Waktu" />
+					<node name="fontSize" value="Ukuran Huruf" />
+					<node name="tocMarks" value="Tampilkan Penanda Daftar Isi" />
+					<node name="navigation" value="Aktifkan Navigasi" />
 				</node>
 				<node name="Scrolling" value="Geser Layar">
 					<node name="optionsFor" value="Pengaturan untuk">
-						<node name="large" value="Pergeseran Besar"/>
-						<node name="small" value="Pergeseran Kecil"/>
-						<node name="mouse" value="Pergeseran Mouse"/>
-						<node name="tap" value="Pergeseran Layar Sentuh"/>
+						<node name="large" value="Pergeseran Besar" />
+						<node name="small" value="Pergeseran Kecil" />
+						<node name="mouse" value="Pergeseran Mouse" />
+						<node name="tap" value="Pergeseran Layar Sentuh" />
 					</node>
-					<node name="delay" value="Waktu Tunda antara Pergeseran, mdetik"/>
+					<node name="delay" value="Waktu Tunda antara Pergeseran, mdetik" />
 					<node name="mode" value="Mode Pergeseran">
-						<node name="noOverlapping" value="Jangan Tumpang Tindih"/>
-						<node name="keepLines" value="Biarkan Baris"/>
-						<node name="scrollLines" value="Geser Baris"/>
-						<node name="scrollPercentage" value="Pensentase Pergeseran"/>
-						<node name="disable" value="Non-aktifkan"/>
+						<node name="noOverlapping" value="Jangan Tumpang Tindih" />
+						<node name="keepLines" value="Biarkan Baris" />
+						<node name="scrollLines" value="Geser Baris" />
+						<node name="scrollPercentage" value="Pensentase Pergeseran" />
+						<node name="disable" value="Non-aktifkan" />
 					</node>
-					<node name="linesToKeep" value="Baris yang Dibiarkan"/>
-					<node name="linesToScroll" value="Baris yang Digeser"/>
-					<node name="percentToScroll" value="Persentase yang Digeser"/>
-					<node name="fingerOnly" value="Geser Hanya Menggunakan Layar Sentuh"/>
+					<node name="linesToKeep" value="Baris yang Dibiarkan" />
+					<node name="linesToScroll" value="Baris yang Digeser" />
+					<node name="percentToScroll" value="Persentase yang Digeser" />
+					<node name="fingerOnly" value="Geser Hanya Menggunakan Layar Sentuh" />
 				</node>
 				<node name="Selection" value="Seleksi">
-					<node name="enableSelection" value="Aktifkan Seleksi Teks"/>
+					<node name="enableSelection" value="Aktifkan Seleksi Teks" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Gunakan Selalu Bentuk Huruf Milik Saya" />
 				</node>
 				<node name="Margins" value="Margin">
-					<node name="left" value="Margin Kiri"/>
-					<node name="right" value="Margin Kanan"/>
-					<node name="top" value="Margin Atas"/>
-					<node name="bottom" value="Margin Bawah"/>
+					<node name="left" value="Margin Kiri" />
+					<node name="right" value="Margin Kanan" />
+					<node name="top" value="Margin Atas" />
+					<node name="bottom" value="Margin Bawah" />
 				</node>
 				<node name="Format" value="Format">
-					<node name="optionsFor" value="Pengaturan untuk"/>
+					<node name="optionsFor" value="Pengaturan untuk" />
 					<node name="lineSpacing" value="Jarak Baris">
-						<node name="unchanged" value="&lt;tidak diubah&gt;"/>
+						<node name="unchanged" value="&lt;tidak diubah&gt;" />
 					</node>
-					<node name="firstLineIndent" value="Indentasi Baris Pertama"/>
+					<node name="firstLineIndent" value="Indentasi Baris Pertama" />
 					<node name="alignment" value="Perataan Teks">
-						<node name="left" value="Kiri"/>
-						<node name="right" value="Kanan"/>
-						<node name="center" value="Tengah"/>
-						<node name="justify" value="Rata Kanan Kiri"/>
-						<node name="unchanged" value="&lt;tidak diubah&gt;"/>
+						<node name="left" value="Kiri" />
+						<node name="right" value="Kanan" />
+						<node name="center" value="Tengah" />
+						<node name="justify" value="Rata Kanan Kiri" />
+						<node name="unchanged" value="&lt;tidak diubah&gt;" />
 					</node>
-					<node name="spaceBefore" value="Jarak Sebelumnya"/>
-					<node name="spaceAfter" value="Jarak Setelahnya"/>
-					<node name="leftIndent" value="Indentasi Kiri"/>
-					<node name="rightIndent" value="Indentasi Kanan"/>
+					<node name="spaceBefore" value="Jarak Sebelumnya" />
+					<node name="spaceAfter" value="Jarak Setelahnya" />
+					<node name="startIndent" value="Indentasi Baris Awal" />
+					<node name="endIndent" value="Indentasi Baris Akhir" />
 				</node>
 				<node name="Styles" value="Bentuk">
-					<node name="optionsFor" value="Pengaturan untuk"/>
+					<node name="optionsFor" value="Pengaturan untuk" />
 					<node name="fontFamily" value="Keluarga">
-						<node name="unchanged" value="&lt;tidak diubah&gt;"/>
+						<node name="unchanged" value="&lt;tidak diubah&gt;" />
 					</node>
-					<node name="fontSize" value="Ukuran"/>
-					<node name="fontSizeDifference" value="Perbedaan Ukuran"/>
-					<node name="bold" value="Tebal"/>
-					<node name="italic" value="Miring"/>
-					<node name="allowHyphenations" value="Ijinkan Pemenggalan Kata"/>
-					<node name="autoHyphenations" value="Pemenggalan Kata Otomatis"/>
+					<node name="fontSize" value="Ukuran" />
+					<node name="fontSizeDifference" value="Perbedaan Ukuran" />
+					<node name="bold" value="Tebal" />
+					<node name="italic" value="Miring" />
+					<node name="allowHyphenations" value="Ijinkan Pemenggalan Kata" />
+					<node name="autoHyphenations" value="Pemenggalan Kata Otomatis" />
 				</node>
 				<node name="Rotation" value="Rotasi">
 					<node name="direction" value="Tipe Rotasi">
-						<node name="disabled" value="Non-aktifkan"/>
-						<node name="clockwise" value="90 Derajat Searah Jarum Jam"/>
-						<node name="counterclockwise" value="90 Derajat Berlawanan Jarum Jam"/>
-						<node name="180" value="180 Derajat"/>
-						<node name="cycle" value="Rotasi 4 Arah Bergantian"/>
+						<node name="disabled" value="Non-aktifkan" />
+						<node name="clockwise" value="90 Derajat Searah Jarum Jam" />
+						<node name="counterclockwise" value="90 Derajat Berlawanan Jarum Jam" />
+						<node name="180" value="180 Derajat" />
+						<node name="cycle" value="Rotasi 4 Arah Bergantian" />
 					</node>
 				</node>
 				<node name="Colors" value="Warna">
 					<node name="colorFor" value="Warna untuk">
-						<node name="background" value="Latar Belakang"/>
-						<node name="selectionBackground" value="Latar Belakang Seleksi"/>
-						<node name="text" value="Teks Biasa"/>
-						<node name="internalLink" value="Teks Hyperlink Internal"/>
-						<node name="externalLink" value="Teks Hyperlink Eksternal"/>
-						<node name="highlighted" value="Text Berwarna Cerah"/>
-						<node name="treeLines" value="Garis Diagram Pohon"/>
-						<node name="indicator" value="Indikator Posisi"/>
+						<node name="background" value="Latar Belakang" />
+						<node name="selectionBackground" value="Latar Belakang Seleksi" />
+						<node name="text" value="Teks Biasa" />
+						<node name="internalLink" value="Tautan Teks Internal" />
+						<node name="externalLink" value="Tautan Teks Eksternal" />
+						<node name="bookLink" value="Tautan ke Buku Lainnya" />
+						<node name="highlighted" value="Teks Berwarna Cerah" />
+						<node name="treeLines" value="Garis Diagram Pohon" />
+						<node name="indicator" value="Indikator Posisi" />
 					</node>
 				</node>
 				<node name="Keys" value="Tombol">
-					<node name="grabSystemKeys" value="Tangkap Tombol Sistem"/>
-					<node name="separate" value="Tombol Tergantung dari Orientasi"/>
-					<node name="orientation" value="Orientasi"/>
+					<node name="grabSystemKeys" value="Tangkap Tombol Sistem" />
+					<node name="separate" value="Tombol Tergantung dari Orientasi" />
+					<node name="orientation" value="Orientasi" />
 					<node name="action">
-						<node name="none" value="Tidak Terpakai"/>
-						<node name="showLibrary" value="Tampilkan Pustaka"/>
-						<node name="showRecent" value="Tampilkan Buku-buku Sebelumnya"/>
-						<node name="previousBook" value="Buka Buku Sebelumnya"/>
-						<node name="toc" value="Tampilkan Daftar Isi"/>
-						<node name="gotoHome" value="Ke Awal Dokumen"/>
-						<node name="gotoSectionStart" value="Ke Awal Seksi"/>
-						<node name="gotoSectionEnd" value="Ke Akhir Seksi"/>
-						<node name="nextTOCSection" value="Ke Seksi Daftar Isi Berikutnya"/>
-						<node name="previousTOCSection" value="Ke Seksi Daftar Isi Sebelumnya"/>
-						<node name="largeScrollForward" value="Pergeseran Maju yang Besar"/>
-						<node name="largeScrollBackward" value="Pergeseran Mundur yang Besar"/>
-						<node name="smallScrollForward" value="Pergeseran Maju yang Kecil"/>
-						<node name="smallScrollBackward" value="Pergeseran Mundur yang Kecil"/>
-						<node name="undo" value="Mundur"/>
-						<node name="redo" value="Maju"/>
-						<node name="copyToClipboard" value="Salin Teks yang Diseleksi ke Clipboard"/>
-						<node name="openInDictionary" value="Buka Teks yang Diseleksi di Kamus"/>
-						<node name="clearSelection" value="Bersihkan Seleksi"/>
-						<node name="search" value="Pencarian"/>
-						<node name="findPrevious" value="Pencarian Mundur"/>
-						<node name="findNext" value="Pencarian Maju"/>
-						<node name="increaseFont" value="Besarkan Ukuran Huruf"/>
-						<node name="decreaseFont" value="Kecilkan Ukuran Huruf"/>
-						<node name="toggleIndicator" value="Hidup/Matikan Indikator"/>
-						<node name="toggleFullscreen" value="Hidup/Matikan Layar Penuh"/>
-						<node name="onFullscreen" value="Ubah ke Layar Penuh"/>
-						<node name="rotate" value="Putar Layar"/>
-						<node name="preferences" value="Tampilkan Dialog Pengaturan"/>
-						<node name="bookInfo" value="Tampilkan Dialog Informasi Buku"/>
-						<node name="addBook" value="Tambah Buku"/>
-						<node name="cancel" value="Batal"/>
-						<node name="quit" value="Keluar"/>
+						<node name="none" value="Tidak Terpakai" />
+						<node name="showLibrary" value="Tampilkan Pustaka" />
+						<node name="showNetLibrary" value="Tampilkan Pustaka Jaringan" />
+						<node name="showRecent" value="Tampilkan Buku-buku Sebelumnya" />
+						<node name="previousBook" value="Buka Buku Sebelumnya" />
+						<node name="toc" value="Tampilkan Daftar Isi" />
+						<node name="gotoHome" value="Ke Awal Dokumen" />
+						<node name="gotoSectionStart" value="Ke Awal Seksi" />
+						<node name="gotoSectionEnd" value="Ke Akhir Seksi" />
+						<node name="nextTOCSection" value="Ke Seksi Daftar Isi Berikutnya" />
+						<node name="previousTOCSection" value="Ke Seksi Daftar Isi Sebelumnya" />
+						<node name="largeScrollForward" value="Pergeseran Maju yang Besar" />
+						<node name="largeScrollBackward" value="Pergeseran Mundur yang Besar" />
+						<node name="smallScrollForward" value="Pergeseran Maju yang Kecil" />
+						<node name="smallScrollBackward" value="Pergeseran Mundur yang Kecil" />
+						<node name="undo" value="Mundur" />
+						<node name="redo" value="Maju" />
+						<node name="copyToClipboard" value="Salin Teks yang Diseleksi ke Clipboard" />
+						<node name="openInDictionary" value="Buka Teks yang Diseleksi di Kamus" />
+						<node name="clearSelection" value="Bersihkan Seleksi" />
+						<node name="search" value="Pencarian" />
+						<node name="findPrevious" value="Pencarian Mundur" />
+						<node name="findNext" value="Pencarian Maju" />
+						<node name="increaseFont" value="Besarkan Ukuran Huruf" />
+						<node name="decreaseFont" value="Kecilkan Ukuran Huruf" />
+						<node name="toggleIndicator" value="Hidup/Matikan Indikator" />
+						<node name="toggleFullscreen" value="Hidup/Matikan Layar Penuh" />
+						<node name="rotate" value="Putar Layar" />
+						<node name="preferences" value="Tampilkan Dialog Pengaturan" />
+						<node name="bookInfo" value="Tampilkan Dialog Informasi Buku" />
+						<node name="addBook" value="Tambah Buku" />
+						<node name="cancel" value="Batal" />
+						<node name="quit" value="Keluar" />
 					</node>
-					<node name="quitOnCancel" value="Keluar dari Aplikasi Ketika Pembatalan"/>
-					<node name="keyDelay" value="Waktu Tunda Antara Penekanan Tombol"/>
+					<node name="quitOnCancel" value="Keluar dari Aplikasi Ketika Pembatalan" />
+					<node name="keyDelay" value="Waktu Tunda Antara Penekanan Tombol" />
 				</node>
 				<node name="Config" value="Konfigurasi">
-					<node name="autoSave" value="Simpan Status Secara Otomatis"/>
-					<node name="timeout" value="Waktu Tunda Antara Penyimpanan, detik"/>
+					<node name="autoSave" value="Simpan Status Secara Otomatis" />
+					<node name="timeout" value="Waktu Tunda Antara Penyimpanan, detik" />
 				</node>
 				<node name="Dictionary" value="Kamus">
-					<node name="enableIntegration" value="Aktifkan Integrasi dengan %s"/>
-					<node name="defaultText" value="Aktifkan Integrasi dengan Kamus"/>
-					<node name="choice" value="Integrasikan dengan"/>
-					<node name="singleClickOpen" value="Buka dengan Klik Tunggal"/>
+					<node name="enableIntegration" value="Aktifkan Integrasi dengan %s" />
+					<node name="defaultText" value="Aktifkan Integrasi dengan Kamus" />
+					<node name="choice" value="Integrasikan dengan" />
+					<node name="singleClickOpen" value="Buka dengan Klik Tunggal" />
 				</node>
 				<node name="Web" value="Web">
-					<node name="enableIntegration" value="Buka Link Eksternal dengan %s"/>
-					<node name="defaultText" value="Buka Link Eksternal dengan Browser"/>
-					<node name="choice" value="Gunakan Browser"/>
-					<node name="command" value="Perintah yang Dieksekusi"/>
+					<node name="enableIntegration" value="Buka Tautan Eksternal dengan %s" />
+					<node name="defaultText" value="Buka Tautan Eksternal dengan Browser" />
+					<node name="choice" value="Gunakan Browser" />
+					<node name="command" value="Perintah yang Dieksekusi" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Tombol Aktif saat Dilepas, bukan saat Ditekan"/>
-					<node name="minStylusPressure" value="Tekanan Minimal Stylus"/>
-					<node name="maxStylusPressure" value="Tekanan Maksimal Stylus"/>
+					<node name="keyActionOnRelease" value="Tombol Aktif saat Dilepas, bukan saat Ditekan" />
+					<node name="minStylusPressure" value="Tekanan Minimal Stylus" />
+					<node name="maxStylusPressure" value="Tekanan Maksimal Stylus" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informasi Buku"/>
+			<node name="title" value="FBReader - Informasi Buku" />
 			<node name="tab">
 				<node name="Common" value="Umum">
-					<node name="file" value="Berkas"/>
-					<node name="title" value="Judul"/>
-					<node name="authorDisplayName" value="Pengarang (Tertampil)"/>
-					<node name="authorSortKey" value="Pengarang (Pengurut)"/>
-					<node name="language" value="Bahasa"/>
-					<node name="encodingSet" value="Set Enkode"/>
-					<node name="encoding" value="Enkode"/>
+					<node name="file" value="Berkas" />
+					<node name="title" value="Judul" />
+					<node name="authorDisplayName" value="Pengarang (Tertampil)" />
+					<node name="authorSortKey" value="Pengarang (Pengurut)" />
+					<node name="language" value="Bahasa" />
+					<node name="encodingSet" value="Set Enkode" />
+					<node name="encoding" value="Enkode" />
 				</node>
 				<node name="Series" value="Seri">
-					<node name="seriesTitle" value="Judul Seri"/>
-					<node name="bookNumber" value="Nomor Buku"/>
+					<node name="seriesTitle" value="Judul Seri" />
+					<node name="bookNumber" value="Nomor Buku" />
 				</node>
-				<node name="Tags" value="Tags" toBeTranslated="true">
-					<node name="tags" value="Tag List" toBeTranslated="true"/>
+				<node name="Tags" value="Tag">
+					<node name="tags" value="Daftar Tag" />
 				</node>
 				<node name="Text" value="Teks">
-					<node name="breakType" value="Penggal Paragraf pada"/>
-					<node name="ignoreIndent" value="Abaikan Indentasi Kurang dari"/>
-					<node name="buildTOC" value="Buat Daftar Isi"/>
-					<node name="emptyLines" value="Baris Kosong Sebelum Seksi Baru"/>
+					<node name="breakType" value="Penggal Paragraf pada" />
+					<node name="ignoreIndent" value="Abaikan Indentasi Kurang dari" />
+					<node name="buildTOC" value="Buat Daftar Isi" />
+					<node name="emptyLines" value="Baris Kosong Sebelum Seksi Baru" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Penggal Paragraf pada"/>
-					<node name="ignoreIndent" value="Abaikan Indentasi Kurang dari"/>
-					<node name="buildTOC" value="Buat Daftar Isi"/>
-					<node name="emptyLines" value="Baris Kosong Sebelum Seksi Baru"/>
+					<node name="breakType" value="Penggal Paragraf pada" />
+					<node name="ignoreIndent" value="Abaikan Indentasi Kurang dari" />
+					<node name="buildTOC" value="Buat Daftar Isi" />
+					<node name="emptyLines" value="Baris Kosong Sebelum Seksi Baru" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Tambahkan Buku ke Pustaka"/>
+			<node name="title" value="FBReader - Tambahkan Buku ke Pustaka" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Pencarian Text"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="&amp;Abaikan huruf besar/kecil"/>
-			<node name="wholeText" value="&amp;Dalam keseluruhan teks"/>
-			<node name="backward" value="&amp;Pencarian mundur"/>
-			<node name="currentSection" value="&amp;Hanya dalam seksi ini"/>
+			<node name="title" value="Pencarian Text" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="&amp;Abaikan huruf besar/kecil" />
+			<node name="wholeText" value="&amp;Dalam keseluruhan teks" />
+			<node name="backward" value="&amp;Pencarian mundur" />
+			<node name="currentSection" value="&amp;Hanya dalam seksi ini" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Pencarian Jaringan" />
+			<node name="bookTitle" value="Judul" />
+			<node name="author" value="Pengarang" />
+			<node name="category" value="Kategori" />
+			<node name="series" value="Seri" />
+			<node name="description" value="Deskripsi" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Ke Halaman"/>
-			<node name="pageNumber" value="Ke Nomor Halaman"/>
+			<node name="title" value="Ke Halaman" />
+			<node name="pageNumber" value="Ke Nomor Halaman" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Edit/Clone Tag" toBeTranslated="true"/>
-			<node name="editOrClone" value="Action" toBeTranslated="true">
-				<node name="edit" value="Rename Tag" toBeTranslated="true"/>
-				<node name="clone" value="Clone Tag" toBeTranslated="true"/>
+			<node name="title" value="Ubah/Gandakan Tag" />
+			<node name="editOrClone" value="Aksi">
+				<node name="edit" value="Ubah Nama Tag" />
+				<node name="clone" value="Gandakan Tag" />
 			</node>
-			<node name="name" value="Tag Name" toBeTranslated="true"/>
-			<node name="includeSubtags" value="Include Subtags" toBeTranslated="true"/>
+			<node name="name" value="Nama Tag" />
+			<node name="includeSubtags" value="Termasuk Sub Tag" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Hapus Buku"/>
-			<node name="message" value="Hapus buku &#13;&quot;%s&quot;&#13; dari Pustaka?"/>
+			<node name="title" value="Hapus Buku" />
+			<node name="message" value="Hapus buku&#10;&quot;%s&quot;&#10;dari Pustaka?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Remove Tag" toBeTranslated="true"/>
-			<node name="message" value="Remove Tag &#8220;%s&#8221;?" toBeTranslated="true"/>
+			<node name="title" value="Hapus Tag" />
+			<node name="message" value="Hapus Tag “%s”?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Ada Kesalahan"/>
-			<node name="message" value="Tidak dapat membuka:&#13;%s"/>
+			<node name="title" value="Ada Kesalahan" />
+			<node name="message" value="Tidak dapat membuka:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Ada Kesalahan"/>
-			<node name="message" value="Berkas tidak ditemukan, maaf"/>
+			<node name="title" value="Ada Kesalahan" />
+			<node name="message" value="Berkas tidak ditemukan, maaf" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Ada Kesalahan"/>
-			<node name="message" value="Tag name must be a non-empty string" toBeTranslated="true"/>
+			<node name="title" value="Ada Kesalahan" />
+			<node name="message" value="Nama tag tidak boleh kosong" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Ada Kesalahan"/>
-			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol" toBeTranslated="true"/>
+			<node name="title" value="Ada Kesalahan" />
+			<node name="message" value="Nama tag tidak boleh mengandung sebuah simbol “,”" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Daftar pustaka kosong" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Bermasalah waktu melakukan download" />
+			<node name="message" value="Sementara tidak dapat melakukan download buku ini" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Membaca buku. Silakan tunggu..."/>
-			<node name="loadingBookList" value="Membaca daftar buku. Silakan tunggu..."/>
-			<node name="migrate" value="Upgrading to the new version. Please, wait..." toBeTranslated="true"/>
+			<node name="loadingBook" value="Membaca buku. Silakan tunggu..." />
+			<node name="loadingBookList" value="Membaca daftar buku. Silakan tunggu..." />
+			<node name="migrate" value="Melakukan pembaruan ke versi baru. Silakan tunggu..." />
+			<node name="downloadBookList" value="Daftar buku sedang di-download. Harap tunggu..." />
+			<node name="downloadBook" value="Buku sedang di-download. Harap tunggu..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="Dasar"/>
-		<node name="Regular Paragraph" value="Paragraf Biasa"/>
-		<node name="Title" value="Judul"/>
-		<node name="Section Title" value="Judul Seksi"/>
-		<node name="Poem Title" value="Judul Poem"/>
-		<node name="Subtitle" value="Sub Judul"/>
-		<node name="Annotation" value="Anotasi"/>
-		<node name="Epigraph" value="Epigraf"/>
-		<node name="Stanza" value="Stanza"/>
-		<node name="Verse" value="Verse"/>
-		<node name="Preformatted text" value="Teks Terformat"/>
-		<node name="Image" value="Gambar"/>
-		<node name="Cite" value="Cite"/>
-		<node name="Author" value="Pengarang"/>
-		<node name="Date" value="Tanggal"/>
-		<node name="Internal Hyperlink" value="Hyperlink Internal"/>
-		<node name="Footnote" value="Catatan Kaki"/>
-		<node name="Emphasis" value="Emphasis"/>
-		<node name="Strong" value="Strong"/>
-		<node name="Subscript" value="Subscript"/>
-		<node name="Superscript" value="Superscript"/>
-		<node name="Code" value="Kode"/>
-		<node name="StrikeThrough" value="Teks Tercoret"/>
-		<node name="Contents Table" value="Daftar Isi"/>
-		<node name="Author in Library" value="Pengarang dalam Pustaka"/>
-		<node name="Book in Library" value="Buku dalam Pustaka"/>
-		<node name="Recent Book List" value="Daftar Buku-buku Sebelumnya"/>
-		<node name="Italic" value="Miring"/>
-		<node name="Bold" value="Tebal"/>
-		<node name="Definition" value="Definisi"/>
-		<node name="Definition Description" value="Deskripsi Definisi"/>
-		<node name="Header 1" value="Header 1"/>
-		<node name="Header 2" value="Header 2"/>
-		<node name="Header 3" value="Header 3"/>
-		<node name="Header 4" value="Header 4"/>
-		<node name="Header 5" value="Header 5"/>
-		<node name="Header 6" value="Header 6"/>
-		<node name="External Hyperlink" value="Hyperlink Eksternal"/>
+		<node name="Base" value="Dasar" />
+		<node name="Regular Paragraph" value="Paragraf Biasa" />
+		<node name="Title" value="Judul" />
+		<node name="Section Title" value="Judul Seksi" />
+		<node name="Poem Title" value="Judul Syair" />
+		<node name="Subtitle" value="Sub Judul" />
+		<node name="Annotation" value="Anotasi" />
+		<node name="Epigraph" value="Inskripsi" />
+		<node name="Stanza" value="Bait" />
+		<node name="Verse" value="Ayat" />
+		<node name="Preformatted text" value="Teks Terformat" />
+		<node name="Image" value="Gambar" />
+		<node name="Cite" value="Cuplikan" />
+		<node name="Author" value="Pengarang" />
+		<node name="Date" value="Tanggal" />
+		<node name="Internal Hyperlink" value="Tautan Internal" />
+		<node name="Footnote" value="Catatan Kaki" />
+		<node name="Emphasis" value="Aksentuasi" />
+		<node name="Strong" value="Strong" />
+		<node name="Subscript" value="Subscript" />
+		<node name="Superscript" value="Superscript" />
+		<node name="Code" value="Kode" />
+		<node name="StrikeThrough" value="Teks Tercoret" />
+		<node name="Contents Table" value="Daftar Isi" />
+		<node name="Library Entry" value="Entri Pustaka" />
+		<node name="Recent Book List" value="Daftar Buku-buku Sebelumnya" />
+		<node name="Italic" value="Miring" />
+		<node name="Bold" value="Tebal" />
+		<node name="Definition" value="Definisi" />
+		<node name="Definition Description" value="Deskripsi Definisi" />
+		<node name="Header 1" value="Header 1" />
+		<node name="Header 2" value="Header 2" />
+		<node name="Header 3" value="Header 3" />
+		<node name="Header 4" value="Header 4" />
+		<node name="Header 5" value="Header 5" />
+		<node name="Header 6" value="Header 6" />
+		<node name="External Hyperlink" value="Tautan Eksternal" />
+		<node name="Link to Another Book" value="Tautan ke Buku Lain" />
 	</node>
 	<node name="external">
-		<node name="browser" value="Browser"/>
-		<node name="defaultBrowser" value="Browser Standar"/>
+		<node name="browser" value="Browser" />
+		<node name="defaultBrowser" value="Browser Standar" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="Ada Kesalahan"/>
-		<node name="unsupportedCompressionMethod" value="Metode kompresi tidak didukung"/>
-		<node name="encriptedFile" value="Berkas terproteksi DRM"/>
+		<node name="unknown" value="Ada Kesalahan" />
+		<node name="unsupportedCompressionMethod" value="Metode kompresi tidak didukung" />
+		<node name="encriptedFile" value="Berkas terproteksi DRM" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Pustaka Jaringan" />
+		<node name="startText" value="Harap masukkan sebuah pola pencarian pada editor teks di toolbar dan tekan &lt;Return&gt;." />
+		<node name="notFound" value="Maaf, buku yang sesuai tidak ditemukan." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Pustaka"/>
-		<node name="allBooks" value="All Books" toBeTranslated="true"/>
-		<node name="booksWithoutTags" value="Books with no Tags" toBeTranslated="true"/>
-		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button." toBeTranslated="true"/>
+		<node name="caption" value="Pustaka" />
+		<node name="allBooks" value="Semua Buku" />
+		<node name="booksWithoutTags" value="Buku Tanpa Tag" />
+		<node name="noBooks" value="FBReader tidak menemukan satupun buku di lokasi yang telah dikonfigurasi. Tentukan lokasi buku dalam Dialog Pengaturan (tab “Pustaka”, entri “Lokasi Buku”). Alternatifnya, Anda dapat menambahkan buku ke pustaka menggunakan tombol “Tambah Buku”." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/it.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/it.xml
--- fbreader-0.8.17/fbreader/data/resources/it.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/it.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,423 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Italian FBReader resources, by Floriano Scioscia -->
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Informazioni Libro..."/>
-	  <node name="toc" value="Indice"/>
+	<node name="menu">
+		<node name="bookInfo" value="Informazioni Libro..." />
+		<node name="toc" value="Indice" />
 		<node name="library" value="Biblioteca">
-			<node name="showLibrary" value="Apri"/>
-			<node name="previousBook" value="Libro Precedente"/>
-			<node name="showRecent" value="Recenti"/>
-			<node name="addBook" value="Aggiungi Libro..."/>
-			<node name="showHelp" value="Informazioni su FBReader"/>
+			<node name="showLibrary" value="Apri" />
+			<node name="previousBook" value="Libro Precedente" />
+			<node name="showRecent" value="Recenti" />
+			<node name="addBook" value="Aggiungi Libro..." />
+			<node name="showHelp" value="Informazioni su FBReader" />
 		</node>
 		<node name="navigate" value="Navigazione">
-			<node name="gotoHome" value="Vai all'Inizio del Documento"/>
-			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
-			<node name="gotoSectionStart" value="Vai all'Inizio di Sezione"/>
-			<node name="gotoSectionEnd" value="Vai alla Fine di Sezione"/>
-			<node name="nextTOCSection" value="Vai al Successivo Elemento dell'Indice"/>
-			<node name="previousTOCSection" value="Vai al Precedente Elemento dell'Indice"/>
-			<node name="undo" value="Vai Indietro"/>
-			<node name="redo" value="Vai Avanti"/>
+			<node name="gotoHome" value="Vai all&apos;Inizio del Documento" />
+			<node name="gotoPageNumber" value="Vai a Pagina..." />
+			<node name="gotoSectionStart" value="Vai all&apos;Inizio di Sezione" />
+			<node name="gotoSectionEnd" value="Vai alla Fine di Sezione" />
+			<node name="nextTOCSection" value="Vai al Successivo Elemento dell&apos;Indice" />
+			<node name="previousTOCSection" value="Vai al Precedente Elemento dell&apos;Indice" />
+			<node name="undo" value="Vai Indietro" />
+			<node name="redo" value="Vai Avanti" />
 		</node>
 		<node name="selection" value="Selezione">
-			<node name="copyToClipboard" value="Copia negli Appunti"/>
-			<node name="openInDictionary" value="Apri in Dizionario"/>
-			<node name="clearSelection" value="Deseleziona"/>
+			<node name="copyToClipboard" value="Copia negli Appunti" />
+			<node name="openInDictionary" value="Apri in Dizionario" />
+			<node name="clearSelection" value="Deseleziona" />
 		</node>
 		<node name="search" value="Trova">
-			<node name="search" value="Trova Testo..."/>
-			<node name="findNext" value="Trova Successivo"/>
-			<node name="findPrevious" value="Trova Precedente"/>
+			<node name="search" value="Trova Testo..." />
+			<node name="findNext" value="Trova Successivo" />
+			<node name="findPrevious" value="Trova Precedente" />
 		</node>
 		<node name="view" value="Visualizzazione">
-			<node name="rotate" value="Ruota Schermo"/>
-			<node name="toggleFullscreen" value="A Tutto Schermo"/>
-			<node name="toggleIndicator" value="Alterna Indicatore"/>
+			<node name="rotate" value="Ruota Schermo" />
+			<node name="toggleFullscreen" value="A Tutto Schermo" />
+			<node name="toggleIndicator" value="Alterna Indicatore" />
 		</node>
-		<node name="preferences" value="Preferenze..."/>
-		<node name="quit" value="Chiudi"/>
+		<node name="preferences" value="Preferenze..." />
+		<node name="quit" value="Chiudi" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Mostra Albero Biblioteca"/>
-		<node name="showRecent" value="Mostra Elenco Libri Recenti"/>
-		<node name="addBook" value="Aggiungi File alla Biblioteca"/>
-		<node name="gotoHome" value="Vai all'Inizio del Testo"/>
-		<node name="undo" value="Vai Indietro"/>
-		<node name="redo" value="Vai Avanti"/>
-		<node name="toc" value="Indice"/>
-		<node name="search" value="Trova Testo"/>
-		<node name="findNext" value="Trova Successivo"/>
-		<node name="findPrevious" value="Trova Precedente"/>
-		<node name="bookInfo" value="Mostra Finestra Informazioni Libro"/>
-		<node name="preferences" value="Mostra Finestra Preferenze"/>
-		<node name="rotate" value="Ruota Testo"/>
-		<node name="showHelp" value="Informazioni su FBReader"/>
+		<node name="showReading" value="Mostra Modalità Lettura" />
+		<node name="showLibrary" value="Mostra Albero Biblioteca">
+			<node name="popup" value="Mostra Elenco Libri Recenti" />
+		</node>
+		<node name="showRecent" value="Mostra Elenco Libri Recenti" />
+		<node name="byAuthor" value="Organizza Libri per Autore" />
+		<node name="byTag" value="Organizza Libri per Tag" />
+		<node name="addBook" value="Aggiungi File alla Biblioteca" />
+		<node name="showNetLibrary" value="Cerca in Biblioteche in Rete" />
+		<node name="searchOnNetwork" value="Ricerca Rete" />
+		<node name="advancedSearchOnNetwork" value="Ricerca Rete Avanzata" />
+		<node name="gotoHome" value="Vai all&apos;Inizio del Testo" />
+		<node name="undo" value="Vai Indietro" />
+		<node name="redo" value="Vai Avanti" />
+		<node name="gotoPageNumberWithParameter" value="Vai a Pagina" />
+		<node name="toc" value="Indice" />
+		<node name="search" value="Trova Testo" />
+		<node name="findNext" value="Trova Successivo" />
+		<node name="findPrevious" value="Trova Precedente" />
+		<node name="bookInfo" value="Mostra Finestra Informazioni Libro" />
+		<node name="preferences" value="Mostra Finestra Preferenze" />
+		<node name="rotate" value="Ruota Testo" />
+		<node name="showHelp" value="Informazioni su FBReader" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Vai!"/>
-			<node name="thisOnly" value="This only" toBeTranslated="true"/>
-			<node name="withSubtags" value="With subtags" toBeTranslated="true"/>
+			<node name="go" value="&amp;Vai!" />
+			<node name="thisOnly" value="Solo questo" />
+			<node name="withSubtags" value="Con sotto-tag" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Opzioni"/>
+			<node name="title" value="FBReader - Opzioni" />
 			<node name="tab">
 				<node name="Library" value="Biblioteca">
-					<node name="bookPath" value="Percorso Libri"/>
-					<node name="lookInSubdirectories" value="Cerca Libri in Sottocartelle"/>
-					<node name="recentListSize" value="Lunghezza Elenco Libri Recenti"/>
-					<node name="showTags" value="Show Tag Hierarchies" toBeTranslated="true"/>
-					<node name="showAllBooksList" value="Show All Books Branch" toBeTranslated="true"/>
+					<node name="bookPath" value="Percorso Libri" />
+					<node name="lookInSubdirectories" value="Cerca Libri in Sottocartelle" />
+					<node name="collectBooksWithoutMetaInfo" value="Raccogli Libri senza Metadati" />
+					<node name="downloadDirectory" value="Cartella per Libri Scaricati" />
+					<node name="showAllBooksTag" value="Tutti i Libri Appaiono nell&apos;Albero" />
+				</node>
+				<node name="NetworkLibrary" value="Ricerca Rete">
+					<node name="useProxy" value="Usa Proxy" />
+					<node name="proxyHost" value="Host del Proxy" />
+					<node name="proxyPort" value="Porta del Proxy" />
+					<node name="timeout" value="Tempo Limite per Operazioni di Rete, secondi" />
 				</node>
 				<node name="Language" value="Lingua">
-					<node name="autoDetect" value="Riconosci Lingua e Codifica Automaticamente"/>
-					<node name="defaultLanguage" value="Lingua Predefinita"/>
-					<node name="defaultEncodingSet" value="Insieme Predefinito di Codifica"/>
-					<node name="defaultEncoding" value="Codifica Predefinita"/>
-					<node name="useWindows1252Hack" value="Use windows-1252 instead of iso-8859-1" toBeTranslated="true"/>
+					<node name="autoDetect" value="Riconosci Lingua e Codifica Automaticamente" />
+					<node name="defaultLanguage" value="Lingua Predefinita" />
+					<node name="defaultEncodingSet" value="Insieme Predefinito di Codifica" />
+					<node name="defaultEncoding" value="Codifica Predefinita" />
+					<node name="useWindows1252Hack" value="Usa windows-1252 invece di iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Indicatore">
-					<node name="show" value="Mostra Indicatore di Posizione"/>
-					<node name="height" value="Altezza Indicatore"/>
-					<node name="offset" value="Distanza dal Testo"/>
-					<node name="pageNumber" value="Mostra Posizione come Numero"/>
-					<node name="time" value="Mostra Orario"/>
-					<node name="fontSize" value="Dimensioni Carattere"/>
-					<node name="tocMarks" value="Mostra Segni Indice"/>
-					<node name="navigation" value="Abilita Navigazione"/>
+					<node name="type" value="Mostra come">
+						<node name="osScrollbar" value="Barra di Scorrimento del Sistema" />
+						<node name="fbIndicator" value="Indicatore Vecchio Stile" />
+						<node name="none" value="Non Mostrare" />
+					</node>
+					<node name="height" value="Altezza Indicatore" />
+					<node name="offset" value="Distanza dal Testo" />
+					<node name="pageNumber" value="Mostra Posizione come Numero" />
+					<node name="time" value="Mostra Orario" />
+					<node name="fontSize" value="Dimensioni Carattere" />
+					<node name="tocMarks" value="Mostra Segni Indice" />
+					<node name="navigation" value="Abilita Navigazione" />
 				</node>
 				<node name="Scrolling" value="Scorrimento">
 					<node name="optionsFor" value="Opzioni per">
-						<node name="large" value="Scorrimenti Grandi"/>
-						<node name="small" value="Scorrimenti Piccoli"/>
-						<node name="mouse" value="Scorrimenti con Mouse"/>
-						<node name="tap" value="Tap Scrollings" toBeTranslated="true"/>
+						<node name="large" value="Scorrimenti Grandi" />
+						<node name="small" value="Scorrimenti Piccoli" />
+						<node name="mouse" value="Scorrimenti con Mouse" />
+						<node name="tap" value="Scorrimenti con Tocco" />
 					</node>
-					<node name="delay" value="Ritardo tra Scorrimenti, msec"/>
-					<node name="mode" value="Modalit&#224; Scorrimento">
-						<node name="noOverlapping" value="Non Sovrapporre"/>
-						<node name="keepLines" value="Mantieni Righe"/>
-						<node name="scrollLines" value="Scorri Righe"/>
-						<node name="scrollPercentage" value="Scorri Percentuale"/>
-						<node name="disable" value="Disabilita"/>
+					<node name="delay" value="Ritardo tra Scorrimenti, msec" />
+					<node name="mode" value="Modalità Scorrimento">
+						<node name="noOverlapping" value="Non Sovrapporre" />
+						<node name="keepLines" value="Mantieni Righe" />
+						<node name="scrollLines" value="Scorri Righe" />
+						<node name="scrollPercentage" value="Scorri Percentuale" />
+						<node name="disable" value="Disabilita" />
 					</node>
-					<node name="linesToKeep" value="Righe da Mantenere"/>
-					<node name="linesToScroll" value="Righe da Scorrere"/>
-					<node name="percentToScroll" value="Percentuale da Scorrere"/>
-					<node name="fingerOnly" value="Scroll on Finger Tap Only" toBeTranslated="true"/>
+					<node name="linesToKeep" value="Righe da Mantenere" />
+					<node name="linesToScroll" value="Righe da Scorrere" />
+					<node name="percentToScroll" value="Percentuale da Scorrere" />
+					<node name="fingerOnly" value="Scorri Solo con Tocco delle Dita" />
 				</node>
 				<node name="Selection" value="Selezione">
-					<node name="enableSelection" value="Enable Text Selection" toBeTranslated="true"/>
+					<node name="enableSelection" value="Abilita Selezione Testo" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Usa Sempre i Miei Font" />
 				</node>
 				<node name="Margins" value="Margini">
-					<node name="left" value="Margine Sinistro"/>
-					<node name="right" value="Margine Destro"/>
-					<node name="top" value="Margine Superiore"/>
-					<node name="bottom" value="Margine Inferiore"/>
+					<node name="left" value="Margine Sinistro" />
+					<node name="right" value="Margine Destro" />
+					<node name="top" value="Margine Superiore" />
+					<node name="bottom" value="Margine Inferiore" />
 				</node>
 				<node name="Format" value="Formato">
-					<node name="optionsFor" value="Opzioni per"/>
+					<node name="optionsFor" value="Opzioni per" />
 					<node name="lineSpacing" value="Spaziatura Righe">
-						<node name="unchanged" value="&lt;invariata&gt;"/>
+						<node name="unchanged" value="&lt;invariata&gt;" />
 					</node>
-					<node name="firstLineIndent" value="Rientro Prima Riga"/>
+					<node name="firstLineIndent" value="Rientro Prima Riga" />
 					<node name="alignment" value="Allineamento">
-						<node name="left" value="Sinistra"/>
-						<node name="right" value="Destra"/>
-						<node name="center" value="Centrato"/>
-						<node name="justify" value="Giustificato"/>
-						<node name="unchanged" value="&lt;invariato&gt;"/>
+						<node name="left" value="Sinistra" />
+						<node name="right" value="Destra" />
+						<node name="center" value="Centrato" />
+						<node name="justify" value="Giustificato" />
+						<node name="unchanged" value="&lt;invariato&gt;" />
 					</node>
-					<node name="spaceBefore" value="Spazio Prima"/>
-					<node name="spaceAfter" value="Spazio Dopo"/>
-					<node name="leftIndent" value="Rientro a Sinistra"/>
-					<node name="rightIndent" value="Rientro a Destra"/>
+					<node name="spaceBefore" value="Spazio Prima" />
+					<node name="spaceAfter" value="Spazio Dopo" />
+					<node name="startIndent" value="Rientro Inizio Riga" />
+					<node name="endIndent" value="Rientro Fine Riga" />
 				</node>
 				<node name="Styles" value="Stili">
-					<node name="optionsFor" value="Options for"/>
+					<node name="optionsFor" value="Opzioni per" />
 					<node name="fontFamily" value="Famiglia Caratteri">
-						<node name="unchanged" value="&lt;invariata&gt;"/>
+						<node name="unchanged" value="&lt;invariata&gt;" />
 					</node>
-					<node name="fontSize" value="Dimensioni"/>
-					<node name="fontSizeDifference" value="Differenza di Dimensioni"/>
-					<node name="bold" value="Grassetto"/>
-					<node name="italic" value="Corsivo"/>
-					<node name="allowHyphenations" value="Permetti Sillabazione"/>
-					<node name="autoHyphenations" value="Sillabazione Automatica"/>
+					<node name="fontSize" value="Dimensioni" />
+					<node name="fontSizeDifference" value="Differenza di Dimensioni" />
+					<node name="bold" value="Grassetto" />
+					<node name="italic" value="Corsivo" />
+					<node name="allowHyphenations" value="Permetti Sillabazione" />
+					<node name="autoHyphenations" value="Sillabazione Automatica" />
 				</node>
 				<node name="Rotation" value="Rotazione">
 					<node name="direction" value="Tipo di Rotazione">
-						<node name="disabled" value="Disabilitata"/>
-						<node name="clockwise" value="Oraria 90 Gradi"/>
-						<node name="counterclockwise" value="Antioraria 90 Gradi"/>
-						<node name="180" value="180 Gradi"/>
-						<node name="cycle" value="Cicla Tra Tutte le 4 Direzioni"/>
+						<node name="disabled" value="Disabilitata" />
+						<node name="clockwise" value="Oraria 90 Gradi" />
+						<node name="counterclockwise" value="Antioraria 90 Gradi" />
+						<node name="180" value="180 Gradi" />
+						<node name="cycle" value="Cicla Tra Tutte le 4 Direzioni" />
 					</node>
 				</node>
 				<node name="Colors" value="Colori">
 					<node name="colorFor" value="Colore di">
-						<node name="background" value="Sfondo"/>
-						<node name="selectionBackground" value="Sfondo della Selezione"/>
-						<node name="text" value="Testo Normale"/>
-						<node name="internalLink" value="Testo Collegamento Interno"/>
-						<node name="externalLink" value="Testo Collegamento Esterno"/>
-						<node name="highlighted" value="Testo Evidenziato"/>
-						<node name="treeLines" value="Linee Albero"/>
-						<node name="indicator" value="Indicatore Posizione"/>
+						<node name="background" value="Sfondo" />
+						<node name="selectionBackground" value="Sfondo della Selezione" />
+						<node name="text" value="Testo Normale" />
+						<node name="internalLink" value="Testo Collegamento Interno" />
+						<node name="externalLink" value="Testo Collegamento Esterno" />
+						<node name="bookLink" value="Link ad Altro Libro" />
+						<node name="highlighted" value="Testo Evidenziato" />
+						<node name="treeLines" value="Linee Albero" />
+						<node name="indicator" value="Indicatore Posizione" />
 					</node>
 				</node>
 				<node name="Keys" value="Tasti">
-					<node name="grabSystemKeys" value="Intercetta Tasti di Sistema"/>
-					<node name="separate" value="Funzione Tasti Dipendente dall'Orientamento"/>
-					<node name="orientation" value="Orientamento"/>
+					<node name="grabSystemKeys" value="Intercetta Tasti di Sistema" />
+					<node name="separate" value="Funzione Tasti Dipendente dall&apos;Orientamento" />
+					<node name="orientation" value="Orientamento" />
 					<node name="action">
-						<node name="none" value="Nessuno"/>
-						<node name="showLibrary" value="Mostra Biblioteca"/>
-						<node name="showRecent" value="Mostra Libri Recenti"/>
-						<node name="previousBook" value="Apri Libro Precedente"/>
-						<node name="toc" value="Mostra Indice"/>
-						<node name="gotoHome" value="Vai alla Pagina Principale"/>
-						<node name="gotoSectionStart" value="Vai all'Inizio di Sezione"/>
-						<node name="gotoSectionEnd" value="Vai alla Fine di Seziona"/>
-						<node name="nextTOCSection" value="Vai alla Sezione Successiva dell'Indice"/>
-						<node name="previousTOCSection" value="Vai alla Sezione Precedente dell'Indice"/>
-						<node name="largeScrollForward" value="Scorrimento Grande in Avanti"/>
-						<node name="largeScrollBackward" value="Scorrimento Grande Indietro"/>
-						<node name="smallScrollForward" value="Scorrimento Piccolo in Avanti"/>
-						<node name="smallScrollBackward" value="Scorrimento Piccolo Indietro"/>
-						<node name="undo" value="Annulla"/>
-						<node name="redo" value="Ripristina"/>
-						<node name="copyToClipboard" value="Copia Testo Selezionato negli Appunti"/>
-						<node name="openInDictionary" value="Apri Testo Selezionato in Dizionario"/>
-						<node name="clearSelection" value="Deseleziona"/>
-						<node name="search" value="Trova"/>
-						<node name="findPrevious" value="Trova Precedente"/>
-						<node name="findNext" value="Trova Successivo"/>
-						<node name="increaseFont" value="Ingrandisci Carattere"/>
-						<node name="decreaseFont" value="Riduci Carattere"/>
-						<node name="toggleIndicator" value="Alterna Indicatore di Posizione"/>
-						<node name="toggleFullscreen" value="Alterna Modalità Schermo Intero"/>
-						<node name="onFullscreen" value="Passa a Modalità Schermo Intero"/>
-						<node name="rotate" value="Ruota Schermo"/>
-						<node name="preferences" value="Mostra Finestra Opzioni"/>
-						<node name="bookInfo" value="Mostra Finestra Informazioni Libro"/>
-						<node name="addBook" value="Aggiungi Libro"/>
-						<node name="cancel" value="Annulla"/>
-						<node name="quit" value="Esci"/>
+						<node name="none" value="Nessuno" />
+						<node name="showLibrary" value="Mostra Biblioteca" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="Mostra Libri Recenti" />
+						<node name="previousBook" value="Apri Libro Precedente" />
+						<node name="toc" value="Mostra Indice" />
+						<node name="gotoHome" value="Vai alla Pagina Principale" />
+						<node name="gotoSectionStart" value="Vai all&apos;Inizio di Sezione" />
+						<node name="gotoSectionEnd" value="Vai alla Fine di Sezione" />
+						<node name="nextTOCSection" value="Vai alla Sezione Successiva dell&apos;Indice" />
+						<node name="previousTOCSection" value="Vai alla Sezione Precedente dell&apos;Indice" />
+						<node name="largeScrollForward" value="Scorrimento Grande in Avanti" />
+						<node name="largeScrollBackward" value="Scorrimento Grande Indietro" />
+						<node name="smallScrollForward" value="Scorrimento Piccolo in Avanti" />
+						<node name="smallScrollBackward" value="Scorrimento Piccolo Indietro" />
+						<node name="undo" value="Annulla" />
+						<node name="redo" value="Ripristina" />
+						<node name="copyToClipboard" value="Copia Testo Selezionato negli Appunti" />
+						<node name="openInDictionary" value="Apri Testo Selezionato in Dizionario" />
+						<node name="clearSelection" value="Deseleziona" />
+						<node name="search" value="Trova" />
+						<node name="findPrevious" value="Trova Precedente" />
+						<node name="findNext" value="Trova Successivo" />
+						<node name="increaseFont" value="Ingrandisci Carattere" />
+						<node name="decreaseFont" value="Riduci Carattere" />
+						<node name="toggleIndicator" value="Alterna Indicatore di Posizione" />
+						<node name="toggleFullscreen" value="Alterna Modalità Schermo Intero" />
+						<node name="rotate" value="Ruota Schermo" />
+						<node name="preferences" value="Mostra Finestra Opzioni" />
+						<node name="bookInfo" value="Mostra Finestra Informazioni Libro" />
+						<node name="addBook" value="Aggiungi Libro" />
+						<node name="cancel" value="Annulla" />
+						<node name="quit" value="Esci" />
 					</node>
-					<node name="quitOnCancel" value="Esci dall'Applicazione su Annullamento"/>
-					<node name="keyDelay" value="Ritardo Tra Pressione Tasti Accettati"/>
+					<node name="quitOnCancel" value="Esci dall&apos;Applicazione su Annullamento" />
+					<node name="keyDelay" value="Ritardo Tra Pressione Tasti Accettati" />
 				</node>
 				<node name="Config" value="Configurazione">
-					<node name="autoSave" value="Salva Stato Automaticamente"/>
-					<node name="timeout" value="Intervallo tra Salvataggi, sec"/>
+					<node name="autoSave" value="Salva Stato Automaticamente" />
+					<node name="timeout" value="Intervallo tra Salvataggi, sec" />
 				</node>
 				<node name="Dictionary" value="Dizionario">
-					<node name="enableIntegration" value="Abilita Integrazione con %s"/>
-					<node name="defaultText" value="Abilita Integrazione con Dizionario"/>
-					<node name="choice" value="Integra con"/>
-					<node name="singleClickOpen" value="Apri con Clic Singolo"/>
+					<node name="enableIntegration" value="Abilita Integrazione con %s" />
+					<node name="defaultText" value="Abilita Integrazione con Dizionario" />
+					<node name="choice" value="Integra con" />
+					<node name="singleClickOpen" value="Apri con Clic Singolo" />
 				</node>
 				<node name="Web" value="Web">
-					<node name="enableIntegration" value="Apri Collegamenti Esterni in %s"/>
-					<node name="defaultText" value="Apri Collegamenti Esterni in Browser"/>
-					<node name="choice" value="Usa Browser"/>
-					<node name="command" value="Comando da Eseguire"/>
+					<node name="enableIntegration" value="Apri Collegamenti Esterni in %s" />
+					<node name="defaultText" value="Apri Collegamenti Esterni in Browser" />
+					<node name="choice" value="Usa Browser" />
+					<node name="command" value="Comando da Eseguire" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Action on Key Release, not on Key Press" toBeTranslated="true"/>
-					<node name="minStylusPressure" value="Minimal Stylus Pressure" toBeTranslated="true"/>
-					<node name="maxStylusPressure" value="Maximal Stylus Pressure" toBeTranslated="true"/>
+					<node name="keyActionOnRelease" value="Azione su Rilascio Tasto, non su Pressione" />
+					<node name="minStylusPressure" value="Pressione Minima con Pennino" />
+					<node name="maxStylusPressure" value="Pressione Massima con Pennino" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Informazioni Libro"/>
+			<node name="title" value="FBReader - Informazioni Libro" />
 			<node name="tab">
 				<node name="Common" value="Comuni">
-					<node name="file" value="File"/>
-					<node name="title" value="Titolo"/>
-					<node name="authorDisplayName" value="Autore (Nome Mostrato)"/>
-					<node name="authorSortKey" value="Autore (Ordinamento)"/>
-					<node name="language" value="Lingua"/>
-					<node name="encodingSet" value="Insieme di Codifica"/>
-					<node name="encoding" value="Codifica"/>
+					<node name="file" value="File" />
+					<node name="title" value="Titolo" />
+					<node name="authorDisplayName" value="Autore (Nome Mostrato)" />
+					<node name="authorSortKey" value="Autore (Ordinamento)" />
+					<node name="language" value="Lingua" />
+					<node name="encodingSet" value="Insieme di Codifica" />
+					<node name="encoding" value="Codifica" />
 				</node>
 				<node name="Series" value="Serie">
-					<node name="seriesTitle" value="Titolo della Serie"/>
-					<node name="bookNumber" value="Libro Numero"/>
+					<node name="seriesTitle" value="Titolo della Serie" />
+					<node name="bookNumber" value="Libro Numero" />
 				</node>
-				<node name="Tags" value="Tags" toBeTranslated="true">
-					<node name="tags" value="Tag List" toBeTranslated="true"/>
+				<node name="Tags" value="Tag">
+					<node name="tags" value="Elenco Tag" />
 				</node>
 				<node name="Text" value="Testo">
-					<node name="breakType" value="Interrompi Paragrafo a"/>
-					<node name="ignoreIndent" value="Ignora Rientri Inferiori a"/>
-					<node name="buildTOC" value="Crea Indice"/>
-					<node name="emptyLines" value="Righe Vuote Prima di Nuova Sezione"/>
+					<node name="breakType" value="Interrompi Paragrafo a" />
+					<node name="ignoreIndent" value="Ignora Rientri Inferiori a" />
+					<node name="buildTOC" value="Crea Indice" />
+					<node name="emptyLines" value="Righe Vuote Prima di Nuova Sezione" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Interrompi Paragrafo a"/>
-					<node name="ignoreIndent" value="Ignora Rientri Inferiori a"/>
-					<node name="buildTOC" value="Crea Indice"/>
-					<node name="emptyLines" value="Righe Vuote Prima di Nuova Sezione"/>
+					<node name="breakType" value="Interrompi Paragrafo a" />
+					<node name="ignoreIndent" value="Ignora Rientri Inferiori a" />
+					<node name="buildTOC" value="Crea Indice" />
+					<node name="emptyLines" value="Righe Vuote Prima di Nuova Sezione" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Aggiungi Libro alla Biblioteca"/>
+			<node name="title" value="FBReader - Aggiungi Libro alla Biblioteca" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Trova Testo"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="&amp;Ignora maiuscole/minuscole"/>
-			<node name="wholeText" value="In &amp;tutto il testo"/>
-			<node name="backward" value="&amp;All'indietro"/>
-			<node name="currentSection" value="&amp;Solo questa sezione"/>
+			<node name="title" value="Trova Testo" />
+			<node name="text" value="Testo" />
+			<node name="ignoreCase" value="&amp;Ignora maiuscole/minuscole" />
+			<node name="wholeText" value="In &amp;tutto il testo" />
+			<node name="backward" value="&amp;All&apos;indietro" />
+			<node name="currentSection" value="&amp;Solo questa sezione" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Ricerca Rete" />
+			<node name="bookTitle" value="Titolo" />
+			<node name="author" value="Autore" />
+			<node name="category" value="Categoria" />
+			<node name="series" value="Serie" />
+			<node name="description" value="Descrizione" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Go To Page" toBeTranslated="true"/>
-			<node name="pageNumber" value="Go to Page Number" toBeTranslated="true"/>
+			<node name="title" value="Vai a Pagina" />
+			<node name="pageNumber" value="Vai a Numero di Pagina" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Edit/Clone Tag" toBeTranslated="true"/>
-			<node name="editOrClone" value="Action" toBeTranslated="true">
-				<node name="edit" value="Rename Tag" toBeTranslated="true"/>
-				<node name="clone" value="Clone Tag" toBeTranslated="true"/>
+			<node name="title" value="Modifica/Duplica Tag" />
+			<node name="editOrClone" value="Azione">
+				<node name="edit" value="Rinomina Tag" />
+				<node name="clone" value="Duplica Tag" />
 			</node>
-			<node name="name" value="Tag Name" toBeTranslated="true"/>
-			<node name="includeSubtags" value="Include Subtags" toBeTranslated="true"/>
+			<node name="name" value="Nome Tag" />
+			<node name="includeSubtags" value="Includi Sotto-tag" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Elimina Libro"/>
-			<node name="message" value="Elimina Libro &#13;&quot;%s&quot;&#13; dalla Biblioteca?"/>
+			<node name="title" value="Elimina Libro" />
+			<node name="message" value="Eliminare il Libro&#10;&quot;%s&quot;&#10;dalla Biblioteca?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Remove Tag" toBeTranslated="true"/>
-			<node name="message" value="Remove Tag &#8220;%s&#8221;?" toBeTranslated="true"/>
+			<node name="title" value="Elimina Tag" />
+			<node name="message" value="Eliminare il Tag “%s”?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Errore"/>
-			<node name="message" value="Impossibile aprire:&#13;%s"/>
+			<node name="title" value="Errore" />
+			<node name="message" value="Impossibile aprire:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Errore"/>
-			<node name="message" value="Spiacente, file della Guida non trovato"/>
+			<node name="title" value="Errore" />
+			<node name="message" value="Spiacente, file della Guida non trovato" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Errore"/>
-			<node name="message" value="Tag name must be a non-empty string" toBeTranslated="true"/>
+			<node name="title" value="Errore" />
+			<node name="message" value="Il nome del tag non deve essere vuoto" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Errore"/>
-			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol" toBeTranslated="true"/>
+			<node name="title" value="Errore" />
+			<node name="message" value="Il nome del tag non deve contenere il simbolo &quot;,&quot;" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Elenco biblioteche vuoto" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Errore durante il download" />
+			<node name="message" value="Impossibile scaricare questo libro al momento" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Caricamento libro. Attendere, prego..."/>
-			<node name="loadingBookList" value="Caricamento elenco libri. Attendere, prego..."/>
-			<node name="migrate" value="Upgrading to the new version. Please, wait..." toBeTranslated="true"/>
+			<node name="loadingBook" value="Caricamento libro. Attendere, prego..." />
+			<node name="loadingBookList" value="Caricamento elenco libri. Attendere, prego..." />
+			<node name="migrate" value="Aggiornamento alla nuova versione. Attendere, prego..." />
+			<node name="downloadBookList" value="Scaricamento elenco libri. Attendere, prego..." />
+			<node name="downloadBook" value="Scaricamento libro. Attendere, prego..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="Base"/>
-		<node name="Regular Paragraph" value="Paragrafo Normale"/>
-		<node name="Title" value="Titolo"/>
-		<node name="Section Title" value="Title di Sezione"/>
-		<node name="Poem Title" value="Titolo di Poesia"/>
-		<node name="Subtitle" value="Sottotitolo"/>
-		<node name="Annotation" value="Annozione"/>
-		<node name="Epigraph" value="Epigrafe"/>
-		<node name="Stanza" value="Strofa"/>
-		<node name="Verse" value="Verso"/>
-		<node name="Preformatted text" value="Testo preformattato"/>
-		<node name="Image" value="Immagine"/>
-		<node name="Cite" value="Citazione"/>
-		<node name="Author" value="Autore"/>
-		<node name="Date" value="Data"/>
-		<node name="Internal Hyperlink" value="Collegamento Interno"/>
-		<node name="Footnote" value="Nota"/>
-		<node name="Emphasis" value="Enfasi"/>
-		<node name="Strong" value="Rafforzato"/>
-		<node name="Subscript" value="Pedice"/>
-		<node name="Superscript" value="Apice"/>
-		<node name="Code" value="Codice"/>
-		<node name="StrikeThrough" value="Barrato"/>
-		<node name="Contents Table" value="Tabella di Contenuti"/>
-		<node name="Author in Library" value="Autore in Biblioteca"/>
-		<node name="Book in Library" value="Libro in Biblioteca"/>
-		<node name="Recent Book List" value="Elenco Libri Recenti"/>
-		<node name="Italic" value="Corsivo"/>
-		<node name="Bold" value="Grassetto"/>
-		<node name="Definition" value="Definizione"/>
-		<node name="Definition Description" value="Descrizione di Definizione"/>
-		<node name="Header 1" value="Intestazione 1"/>
-		<node name="Header 2" value="Intestazione 2"/>
-		<node name="Header 3" value="Intestazione 3"/>
-		<node name="Header 4" value="Intestazione 4"/>
-		<node name="Header 5" value="Intestazione 5"/>
-		<node name="Header 6" value="Intestazione 6"/>
-		<node name="External Hyperlink" value="Collegamento Esterno"/>
+		<node name="Base" value="Base" />
+		<node name="Regular Paragraph" value="Paragrafo Normale" />
+		<node name="Title" value="Titolo" />
+		<node name="Section Title" value="Titolo di Sezione" />
+		<node name="Poem Title" value="Titolo di Poesia" />
+		<node name="Subtitle" value="Sottotitolo" />
+		<node name="Annotation" value="Annozione" />
+		<node name="Epigraph" value="Epigrafe" />
+		<node name="Stanza" value="Strofa" />
+		<node name="Verse" value="Verso" />
+		<node name="Preformatted text" value="Testo preformattato" />
+		<node name="Image" value="Immagine" />
+		<node name="Cite" value="Citazione" />
+		<node name="Author" value="Autore" />
+		<node name="Date" value="Data" />
+		<node name="Internal Hyperlink" value="Collegamento Interno" />
+		<node name="Footnote" value="Nota" />
+		<node name="Emphasis" value="Enfasi" />
+		<node name="Strong" value="Rafforzato" />
+		<node name="Subscript" value="Pedice" />
+		<node name="Superscript" value="Apice" />
+		<node name="Code" value="Codice" />
+		<node name="StrikeThrough" value="Barrato" />
+		<node name="Contents Table" value="Tabella di Contenuti" />
+		<node name="Library Entry" value="Voce di Biblioteca" />
+		<node name="Recent Book List" value="Elenco Libri Recenti" />
+		<node name="Italic" value="Corsivo" />
+		<node name="Bold" value="Grassetto" />
+		<node name="Definition" value="Definizione" />
+		<node name="Definition Description" value="Descrizione di Definizione" />
+		<node name="Header 1" value="Intestazione 1" />
+		<node name="Header 2" value="Intestazione 2" />
+		<node name="Header 3" value="Intestazione 3" />
+		<node name="Header 4" value="Intestazione 4" />
+		<node name="Header 5" value="Intestazione 5" />
+		<node name="Header 6" value="Intestazione 6" />
+		<node name="External Hyperlink" value="Collegamento Esterno" />
+		<node name="Link to Another Book" value="Collegamento ad Altro Libro" />
 	</node>
 	<node name="external">
-		<node name="browser" value="Browser"/>
-		<node name="defaultBrowser" value="Browser Predefinito"/>
+		<node name="browser" value="Browser" />
+		<node name="defaultBrowser" value="Browser Predefinito" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="Errore Sconosciuto"/>
-		<node name="unsupportedCompressionMethod" value="Metodo di Compressione non Supportato"/>
-		<node name="encriptedFile" value="File Protetto da DRM"/>
+		<node name="unknown" value="Errore Sconosciuto" />
+		<node name="unsupportedCompressionMethod" value="Metodo di Compressione non Supportato" />
+		<node name="encriptedFile" value="File Protetto da DRM" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Biblioteca in Rete" />
+		<node name="startText" value="Prego immettere un testo di ricerca nel campo sulla barra degli strumenti e premere &lt;Invio&gt;." />
+		<node name="notFound" value="Spiacente, nessun libro corrispondente trovato." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Biblioteca"/>
-		<node name="allBooks" value="All Books" toBeTranslated="true"/>
-		<node name="booksWithoutTags" value="Books with no Tags" toBeTranslated="true"/>
-		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button." toBeTranslated="true"/>
+		<node name="caption" value="Biblioteca" />
+		<node name="allBooks" value="Tutti i Libri" />
+		<node name="booksWithoutTags" value="Libri senza Tag" />
+		<node name="noBooks" value="FBReader non ha trovato libri nelle posizioni impostate. Prego specificare il percorso dei propri libri nella schermata Opzioni (scheda &quot;Biblioteca&quot;, voce &quot;Percorso Libri&quot;). Altrimenti, è possibile aggiungere libri alla biblioteca usando il pulsante &quot;Aggiungi Libro&quot;." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/ru.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/ru.xml
--- fbreader-0.8.17/fbreader/data/resources/ru.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/ru.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,422 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Информация о книге..."/>
-	  <node name="toc" value="Содержание"/>
+	<node name="menu">
+		<node name="bookInfo" value="Информация о книге..." />
+		<node name="toc" value="Содержание" />
 		<node name="library" value="Библиотека">
-			<node name="showLibrary" value="Открыть библиотеку"/>
-			<node name="previousBook" value="Предыдущая книга"/>
-			<node name="showRecent" value="Прочитанные книги"/>
-			<node name="addBook" value="Добавить файл..."/>
-			<node name="showHelp" value="О программе FBReader"/>
+			<node name="showLibrary" value="Открыть библиотеку" />
+			<node name="previousBook" value="Предыдущая книга" />
+			<node name="showRecent" value="Прочитанные книги" />
+			<node name="addBook" value="Добавить файл..." />
+			<node name="showHelp" value="О программе FBReader" />
 		</node>
 		<node name="navigate" value="Переход">
-			<node name="gotoHome" value="В начало книги"/>
-			<node name="gotoPageNumber" value="На страницу..."/>
-			<node name="gotoSectionStart" value="В начало раздела"/>
-			<node name="gotoSectionEnd" value="В конец раздела"/>
-			<node name="nextTOCSection" value="К следующей главе"/>
-			<node name="previousTOCSection" value="К предыдущей главе"/>
-			<node name="undo" value="Назад"/>
-			<node name="redo" value="Вперед"/>
+			<node name="gotoHome" value="В начало книги" />
+			<node name="gotoPageNumber" value="На страницу..." />
+			<node name="gotoSectionStart" value="В начало раздела" />
+			<node name="gotoSectionEnd" value="В конец раздела" />
+			<node name="nextTOCSection" value="К следующей главе" />
+			<node name="previousTOCSection" value="К предыдущей главе" />
+			<node name="undo" value="Назад" />
+			<node name="redo" value="Вперед" />
 		</node>
 		<node name="selection" value="Пометка">
-			<node name="copyToClipboard" value="Скопировать в буфер"/>
-			<node name="openInDictionary" value="Посмотреть в словаре"/>
-			<node name="clearSelection" value="Убрать пометку"/>
+			<node name="copyToClipboard" value="Скопировать в буфер" />
+			<node name="openInDictionary" value="Посмотреть в словаре" />
+			<node name="clearSelection" value="Убрать пометку" />
 		</node>
 		<node name="search" value="Поиск">
-			<node name="search" value="Искать..."/>
-			<node name="findNext" value="Искать дальше"/>
-			<node name="findPrevious" value="Искать раньше"/>
+			<node name="search" value="Искать..." />
+			<node name="findNext" value="Искать дальше" />
+			<node name="findPrevious" value="Искать раньше" />
 		</node>
 		<node name="view" value="Изображение">
-			<node name="rotate" value="Повернуть"/>
-			<node name="toggleFullscreen" value="На весь экран"/>
-			<node name="toggleIndicator" value="Индикатор позиции"/>
+			<node name="rotate" value="Повернуть" />
+			<node name="toggleFullscreen" value="На весь экран" />
+			<node name="toggleIndicator" value="Индикатор позиции" />
 		</node>
-		<node name="preferences" value="Настройки..."/>
-		<node name="quit" value="Закрыть"/>
+		<node name="preferences" value="Настройки..." />
+		<node name="quit" value="Закрыть" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Библиотека"/>
-		<node name="showRecent" value="Прочитанные книги"/>
-		<node name="addBook" value="Добавить файл в библиотеку"/>
-		<node name="gotoHome" value="В начало книги"/>
-		<node name="undo" value="Назад"/>
-		<node name="redo" value="Вперед"/>
-		<node name="toc" value="Оглавление"/>
-		<node name="search" value="Поиск"/>
-		<node name="findNext" value="Найти следующий"/>
-		<node name="findPrevious" value="Найти предыдущий"/>
-		<node name="bookInfo" value="Информация о книге"/>
-		<node name="preferences" value="Настройки"/>
-		<node name="rotate" value="Поворот текста"/>
-		<node name="showHelp" value="О программе"/>
+		<node name="showReading" value="Вернуться к чтению" />
+		<node name="showLibrary" value="Библиотека">
+			<node name="popup" value="Прочитанные книги" />
+		</node>
+		<node name="showRecent" value="Прочитанные книги" />
+		<node name="byAuthor" value="По авторам" />
+		<node name="byTag" value="По категориям" />
+		<node name="addBook" value="Добавить файл в библиотеку" />
+		<node name="showNetLibrary" value="Поиск по сетевым библиотекам" />
+		<node name="searchOnNetwork" value="Быстрый поиск в сети" />
+		<node name="advancedSearchOnNetwork" value="Поиск в сети" />
+		<node name="gotoHome" value="В начало книги" />
+		<node name="undo" value="Назад" />
+		<node name="redo" value="Вперед" />
+		<node name="gotoPageNumberWithParameter" value="Перейти на страницу" />
+		<node name="toc" value="Оглавление" />
+		<node name="search" value="Поиск" />
+		<node name="findNext" value="Найти следующий" />
+		<node name="findPrevious" value="Найти предыдущий" />
+		<node name="bookInfo" value="Информация о книге" />
+		<node name="preferences" value="Настройки" />
+		<node name="rotate" value="Поворот текста" />
+		<node name="showHelp" value="О программе" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Искать"/>
-			<node name="thisOnly" value="Только эту"/>
-			<node name="withSubtags" value="С подкатегориями"/>
+			<node name="go" value="&amp;Искать" />
+			<node name="thisOnly" value="Только эту" />
+			<node name="withSubtags" value="С подкатегориями" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Настройки"/>
+			<node name="title" value="FBReader - Настройки" />
 			<node name="tab">
 				<node name="Library" value="Библиотека">
-					<node name="bookPath" value="Каталоги с книгами"/>
-					<node name="lookInSubdirectories" value="Искать книги в подкаталогах"/>
-					<node name="recentListSize" value="Размер списка прочитанных книг"/>
-					<node name="showTags" value="Сортировать книги по категориям"/>
-					<node name="showAllBooksList" value="Показывать список всех книг"/>
+					<node name="bookPath" value="Каталоги с книгами" />
+					<node name="lookInSubdirectories" value="Искать книги в подкаталогах" />
+					<node name="collectBooksWithoutMetaInfo" value="Сканировать книги без метаинформации" />
+					<node name="downloadDirectory" value="Каталог для загружаемых книг" />
+					<node name="showAllBooksTag" value="Показывать ветвь «Все книги» в дереве" />
+				</node>
+				<node name="NetworkLibrary" value="Поиск в сети">
+					<node name="useProxy" value="Использовать прокси-сервер" />
+					<node name="proxyHost" value="Адрес прокси-сервера" />
+					<node name="proxyPort" value="Порт прокси-сервера" />
+					<node name="timeout" value="Максимальное время задержки, секунды" />
 				</node>
 				<node name="Language" value="Язык">
-					<node name="autoDetect" value="Автоматически определять язык и кодировку"/>
-					<node name="defaultLanguage" value="Язык по умолчанию"/>
-					<node name="defaultEncodingSet" value="Набор кодировок по умолчанию"/>
-					<node name="defaultEncoding" value="Кодировка по умолчанию"/>
-					<node name="useWindows1252Hack" value="Использовать windows-1252 вместо iso-8859-1"/>
+					<node name="autoDetect" value="Автоматически определять язык и кодировку" />
+					<node name="defaultLanguage" value="Язык по умолчанию" />
+					<node name="defaultEncodingSet" value="Набор кодировок по умолчанию" />
+					<node name="defaultEncoding" value="Кодировка по умолчанию" />
+					<node name="useWindows1252Hack" value="Использовать windows-1252 вместо iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Индикатор">
-					<node name="show" value="Показывать индикатор"/>
-					<node name="height" value="Высота индикатора"/>
-					<node name="offset" value="Отступ от текста"/>
-					<node name="pageNumber" value="Показывать номера страниц"/>
-					<node name="time" value="Показывать текущее время"/>
-					<node name="fontSize" value="Размер шрифта"/>
-					<node name="tocMarks" value="Показывать пометки начала глав"/>
-					<node name="navigation" value="Реагировать на нажатия"/>
+					<node name="type" value="Внешний вид">
+						<node name="osScrollbar" value="полоса прокрутки" />
+						<node name="fbIndicator" value="индикатор внизу" />
+						<node name="none" value="не показывать" />
+					</node>
+					<node name="height" value="Высота индикатора" />
+					<node name="offset" value="Отступ от текста" />
+					<node name="pageNumber" value="Показывать номера страниц" />
+					<node name="time" value="Показывать текущее время" />
+					<node name="fontSize" value="Размер шрифта" />
+					<node name="tocMarks" value="Показывать пометки начала глав" />
+					<node name="navigation" value="Реагировать на нажатия" />
 				</node>
 				<node name="Scrolling" value="Перелистывание">
 					<node name="optionsFor" value="Настройки перелистывания">
-						<node name="large" value="на большое расстояние"/>
-						<node name="small" value="на небольшое расстояние"/>
-						<node name="mouse" value="колесом мышки"/>
-						<node name="tap" value="нажатием на экран"/>
+						<node name="large" value="на большое расстояние" />
+						<node name="small" value="на небольшое расстояние" />
+						<node name="mouse" value="колесом мышки" />
+						<node name="tap" value="нажатием на экран" />
 					</node>
-					<node name="delay" value="Задержка, миллисекунды"/>
+					<node name="delay" value="Задержка, миллисекунды" />
 					<node name="mode" value="Перелистывание">
-						<node name="noOverlapping" value="без перекрытия"/>
-						<node name="keepLines" value="перекрывает несколько строк"/>
-						<node name="scrollLines" value="сдвигает несколько строк"/>
-						<node name="scrollPercentage" value="сдвигает часть текста"/>
-						<node name="disable" value="выключено"/>
+						<node name="noOverlapping" value="без перекрытия" />
+						<node name="keepLines" value="перекрывает несколько строк" />
+						<node name="scrollLines" value="сдвигает несколько строк" />
+						<node name="scrollPercentage" value="сдвигает часть текста" />
+						<node name="disable" value="выключено" />
 					</node>
-					<node name="linesToKeep" value="Сколько строк перекрывать"/>
-					<node name="linesToScroll" value="Сколько строк сдвигать"/>
-					<node name="percentToScroll" value="Сколько процентов сдвигать"/>
-					<node name="fingerOnly" value="Только при нажатии пальцем"/>
+					<node name="linesToKeep" value="Сколько строк перекрывать" />
+					<node name="linesToScroll" value="Сколько строк сдвигать" />
+					<node name="percentToScroll" value="Сколько процентов сдвигать" />
+					<node name="fingerOnly" value="Только при нажатии пальцем" />
 				</node>
 				<node name="Selection" value="Пометка">
-					<node name="enableSelection" value="Разрешить помечать текст"/>
+					<node name="enableSelection" value="Разрешить помечать текст" />
+				</node>
+				<node name="CSS" value="CSS">
+					<node name="overrideSpecifiedFonts" value="Всегда использовать собственные шрифты" />
 				</node>
 				<node name="Margins" value="Отступы">
-					<node name="left" value="Отступ слева"/>
-					<node name="right" value="Отступ справа"/>
-					<node name="top" value="Отступ сверху"/>
-					<node name="bottom" value="Отступ снизу"/>
+					<node name="left" value="Отступ слева" />
+					<node name="right" value="Отступ справа" />
+					<node name="top" value="Отступ сверху" />
+					<node name="bottom" value="Отступ снизу" />
 				</node>
 				<node name="Format" value="Форматирование">
-					<node name="optionsFor" value="Настройки для"/>
+					<node name="optionsFor" value="Настройки для" />
 					<node name="lineSpacing" value="Интервал">
-						<node name="unchanged" value="&lt;не менять&gt;"/>
+						<node name="unchanged" value="&lt;не менять&gt;" />
 					</node>
-					<node name="firstLineIndent" value="Красная строка"/>
+					<node name="firstLineIndent" value="Красная строка" />
 					<node name="alignment" value="Выравнивание">
-						<node name="left" value="левое"/>
-						<node name="right" value="правое"/>
-						<node name="center" value="по центру"/>
-						<node name="justify" value="по краям"/>
-						<node name="unchanged" value="&lt;не менять&gt;"/>
+						<node name="left" value="левое" />
+						<node name="right" value="правое" />
+						<node name="center" value="по центру" />
+						<node name="justify" value="по краям" />
+						<node name="unchanged" value="&lt;не менять&gt;" />
 					</node>
-					<node name="spaceBefore" value="Пропуск перед"/>
-					<node name="spaceAfter" value="Пропуск после"/>
-					<node name="leftIndent" value="Отступ слева"/>
-					<node name="rightIndent" value="Отступ справа"/>
+					<node name="spaceBefore" value="Пропуск перед" />
+					<node name="spaceAfter" value="Пропуск после" />
+					<node name="startIndent" value="Отступ в начале строки" />
+					<node name="endIndent" value="Отступ в конце строки" />
 				</node>
 				<node name="Styles" value="Стили">
-					<node name="optionsFor" value="Настройки для"/>
+					<node name="optionsFor" value="Настройки для" />
 					<node name="fontFamily" value="Шрифт">
-						<node name="unchanged" value="&lt;не менять&gt;"/>
+						<node name="unchanged" value="&lt;не менять&gt;" />
 					</node>
-					<node name="fontSize" value="Размер"/>
-					<node name="fontSizeDifference" value="Размер"/>
-					<node name="bold" value="Жирный"/>
-					<node name="italic" value="Курсив"/>
-					<node name="allowHyphenations" value="Переносы"/>
-					<node name="autoHyphenations" value="Переносы"/>
+					<node name="fontSize" value="Размер" />
+					<node name="fontSizeDifference" value="Размер" />
+					<node name="bold" value="Жирный" />
+					<node name="italic" value="Курсив" />
+					<node name="allowHyphenations" value="Переносы" />
+					<node name="autoHyphenations" value="Переносы" />
 				</node>
 				<node name="Rotation" value="Поворот">
 					<node name="direction" value="Как поворачивать">
-						<node name="disabled" value="Не поворачивать вообще"/>
-						<node name="clockwise" value="На 90 градусов по часовой стрелке"/>
-						<node name="counterclockwise" value="На 90 градусов против часовой стрелки"/>
-						<node name="180" value="На 180 градусов"/>
-						<node name="cycle" value="Переключаться между 4 ориентациями"/>
+						<node name="disabled" value="Не поворачивать вообще" />
+						<node name="clockwise" value="На 90 градусов по часовой стрелке" />
+						<node name="counterclockwise" value="На 90 градусов против часовой стрелки" />
+						<node name="180" value="На 180 градусов" />
+						<node name="cycle" value="Переключаться между 4 ориентациями" />
 					</node>
 				</node>
 				<node name="Colors" value="Цвета">
 					<node name="colorFor" value="Цвет">
-						<node name="background" value="фона"/>
-						<node name="selectionBackground" value="фона пометки"/>
-						<node name="text" value="обычного текста"/>
-						<node name="internalLink" value="ссылки"/>
-						<node name="externalLink" value="внешней ссылки"/>
-						<node name="highlighted" value="подсвеченного текста"/>
-						<node name="treeLines" value="линий"/>
-						<node name="indicator" value="индикатора"/>
+						<node name="background" value="фона" />
+						<node name="selectionBackground" value="фона пометки" />
+						<node name="text" value="обычного текста" />
+						<node name="internalLink" value="ссылки" />
+						<node name="externalLink" value="внешней ссылки" />
+						<node name="bookLink" value="ссылки на книгу" />
+						<node name="highlighted" value="подсвеченного текста" />
+						<node name="treeLines" value="линий" />
+						<node name="indicator" value="индикатора" />
 					</node>
 				</node>
 				<node name="Keys" value="Клавиши">
-					<node name="grabSystemKeys" value="Перехватывать системные клавиши"/>
-					<node name="separate" value="Свои настройки для каждой ориентации текста"/>
-					<node name="orientation" value="Ориентация"/>
+					<node name="grabSystemKeys" value="Перехватывать системные клавиши" />
+					<node name="separate" value="Свои настройки для каждой ориентации текста" />
+					<node name="orientation" value="Ориентация" />
 					<node name="action">
-						<node name="none" value="Никакого действия"/>
-						<node name="showLibrary" value="Показать библиотеку"/>
-						<node name="showRecent" value="Показать прочитанные книги"/>
-						<node name="previousBook" value="Открыть предыдущую книгу"/>
-						<node name="toc" value="Показать оглавление"/>
-						<node name="gotoHome" value="Перейти в начало текста"/>
-						<node name="gotoSectionStart" value="Перейти в начало раздела"/>
-						<node name="gotoSectionEnd" value="Перейти в конец раздела"/>
-						<node name="nextTOCSection" value="Перейти к следующей главе"/>
-						<node name="previousTOCSection" value="Перейти к предыдущей главе"/>
-						<node name="largeScrollForward" value="Прокрутить вперед (на большое расстояние)"/>
-						<node name="largeScrollBackward" value="Прокрутить назад (на большое расстояние)"/>
-						<node name="smallScrollForward" value="Прокрутить вперед (на небольшое расстояние)"/>
-						<node name="smallScrollBackward" value="Прокрутить назад (на небольшое расстояние)"/>
-						<node name="undo" value="Отменить переход"/>
-						<node name="redo" value="Повторить переход"/>
-						<node name="copyToClipboard" value="Скопировать помеченный текст в буфер"/>
-						<node name="openInDictionary" value="Открыть помеченный текст в словаре"/>
-						<node name="clearSelection" value="Убрать пометку"/>
-						<node name="search" value="Показать диалог поиска"/>
-						<node name="findPrevious" value="Искать назад"/>
-						<node name="findNext" value="Искать вперед"/>
-						<node name="increaseFont" value="Увеличить размер шрифта"/>
-						<node name="decreaseFont" value="Уменьшить размер шрифта"/>
-						<node name="toggleIndicator" value="Показать/спрятать индикатор"/>
-						<node name="toggleFullscreen" value="Включить/выключить полноэкранный режим"/>
-						<node name="onFullscreen" value="Включить полноэкранный режим"/>
-						<node name="rotate" value="Повернуть текст"/>
-						<node name="preferences" value="Показать диалог настроек"/>
-						<node name="bookInfo" value="Показать информацию о книге"/>
-						<node name="addBook" value="Добавить файл в библиотеку"/>
-						<node name="cancel" value="Отменить текущий режим"/>
-						<node name="quit" value="Выйти из программы"/>
+						<node name="none" value="Никакого действия" />
+						<node name="showLibrary" value="Показать библиотеку" />
+						<node name="showNetLibrary" value="Сетевые библиотеки" />
+						<node name="showRecent" value="Показать прочитанные книги" />
+						<node name="previousBook" value="Открыть предыдущую книгу" />
+						<node name="toc" value="Показать оглавление" />
+						<node name="gotoHome" value="Перейти в начало текста" />
+						<node name="gotoSectionStart" value="Перейти в начало раздела" />
+						<node name="gotoSectionEnd" value="Перейти в конец раздела" />
+						<node name="nextTOCSection" value="Перейти к следующей главе" />
+						<node name="previousTOCSection" value="Перейти к предыдущей главе" />
+						<node name="largeScrollForward" value="Прокрутить вперед (на большое расстояние)" />
+						<node name="largeScrollBackward" value="Прокрутить назад (на большое расстояние)" />
+						<node name="smallScrollForward" value="Прокрутить вперед (на небольшое расстояние)" />
+						<node name="smallScrollBackward" value="Прокрутить назад (на небольшое расстояние)" />
+						<node name="undo" value="Отменить переход" />
+						<node name="redo" value="Повторить переход" />
+						<node name="copyToClipboard" value="Скопировать помеченный текст в буфер" />
+						<node name="openInDictionary" value="Открыть помеченный текст в словаре" />
+						<node name="clearSelection" value="Убрать пометку" />
+						<node name="search" value="Показать диалог поиска" />
+						<node name="findPrevious" value="Искать назад" />
+						<node name="findNext" value="Искать вперед" />
+						<node name="increaseFont" value="Увеличить размер шрифта" />
+						<node name="decreaseFont" value="Уменьшить размер шрифта" />
+						<node name="toggleIndicator" value="Показать/спрятать индикатор" />
+						<node name="toggleFullscreen" value="Включить/выключить полноэкранный режим" />
+						<node name="rotate" value="Повернуть текст" />
+						<node name="preferences" value="Показать диалог настроек" />
+						<node name="bookInfo" value="Показать информацию о книге" />
+						<node name="addBook" value="Добавить файл в библиотеку" />
+						<node name="cancel" value="Отменить текущий режим" />
+						<node name="quit" value="Выйти из программы" />
 					</node>
-					<node name="quitOnCancel" value="Выходить из программы"/>
-					<node name="keyDelay" value="Задержка между нажатиями на клавиши"/>
+					<node name="quitOnCancel" value="Выходить из программы" />
+					<node name="keyDelay" value="Задержка между нажатиями на клавиши" />
 				</node>
 				<node name="Config" value="Настройки">
-					<node name="autoSave" value="Автоматически сохранять состояние"/>
-					<node name="timeout" value="Время между сохранениями, секунды"/>
+					<node name="autoSave" value="Автоматически сохранять состояние" />
+					<node name="timeout" value="Время между сохранениями, секунды" />
 				</node>
 				<node name="Dictionary" value="Словари">
-					<node name="enableIntegration" value="Включить интеграцию с %s"/>
-					<node name="defaultText" value="Включить интеграцию со словарем"/>
-					<node name="choice" value="Использовать"/>
-					<node name="singleClickOpen" value="Открывать словарь по нажатию на слово"/>
+					<node name="enableIntegration" value="Включить интеграцию с %s" />
+					<node name="defaultText" value="Включить интеграцию со словарем" />
+					<node name="choice" value="Использовать" />
+					<node name="singleClickOpen" value="Открывать словарь по нажатию на слово" />
 				</node>
 				<node name="Web" value="Web">
-					<node name="enableIntegration" value="Открывать внешние ссылки в %s"/>
-					<node name="defaultText" value="Окрывать внешние ссылки в браузере"/>
-					<node name="choice" value="Браузер"/>
-					<node name="command" value="Выполнять команду"/>
+					<node name="enableIntegration" value="Открывать внешние ссылки в %s" />
+					<node name="defaultText" value="Открывать внешние ссылки в браузере" />
+					<node name="choice" value="Браузер" />
+					<node name="command" value="Выполнять команду" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Реагировать на отпускание клавиши, а не на нажатие"/>
-					<node name="minStylusPressure" value="Минимальное давление стилуса"/>
-					<node name="maxStylusPressure" value="Максимальное давление стилуса"/>
+					<node name="keyActionOnRelease" value="Реагировать на отпускание клавиши, а не на нажатие" />
+					<node name="minStylusPressure" value="Минимальное давление стилуса" />
+					<node name="maxStylusPressure" value="Максимальное давление стилуса" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Информация о книге"/>
+			<node name="title" value="FBReader - Информация о книге" />
 			<node name="tab">
 				<node name="Common" value="Основная информация">
-					<node name="file" value="Файл"/>
-					<node name="title" value="Название"/>
-					<node name="authorDisplayName" value="Имя автора"/>
-					<node name="authorSortKey" value="Имя для сортировки"/>
-					<node name="language" value="Язык"/>
-					<node name="encodingSet" value="Набор кодировок"/>
-					<node name="encoding" value="Кодировка"/>
+					<node name="file" value="Файл" />
+					<node name="title" value="Название" />
+					<node name="authorDisplayName" value="Имя автора" />
+					<node name="authorSortKey" value="Имя для сортировки" />
+					<node name="language" value="Язык" />
+					<node name="encodingSet" value="Набор кодировок" />
+					<node name="encoding" value="Кодировка" />
 				</node>
 				<node name="Series" value="Серия">
-					<node name="seriesTitle" value="Название серии"/>
-					<node name="bookNumber" value="Номер книги в серии"/>
+					<node name="seriesTitle" value="Название серии" />
+					<node name="bookNumber" value="Номер книги в серии" />
 				</node>
 				<node name="Tags" value="Категории">
-					<node name="tags" value="Список категорий"/>
+					<node name="tags" value="Список категорий" />
 				</node>
 				<node name="Text" value="Текст">
-					<node name="breakType" value="Новый параграф по"/>
-					<node name="ignoreIndent" value="Игнорировать отступы меньше"/>
-					<node name="buildTOC" value="Строить оглавление"/>
-					<node name="emptyLines" value="Пустых строк между главами"/>
+					<node name="breakType" value="Новый параграф по" />
+					<node name="ignoreIndent" value="Игнорировать отступы меньше" />
+					<node name="buildTOC" value="Строить оглавление" />
+					<node name="emptyLines" value="Пустых строк между главами" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Новый параграф по"/>
-					<node name="ignoreIndent" value="Игнорировать отступы меньше"/>
-					<node name="buildTOC" value="Строить оглавление"/>
-					<node name="emptyLines" value="Пустых строк между главами"/>
+					<node name="breakType" value="Новый параграф по" />
+					<node name="ignoreIndent" value="Игнорировать отступы меньше" />
+					<node name="buildTOC" value="Строить оглавление" />
+					<node name="emptyLines" value="Пустых строк между главами" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Добавление книги в библиотеку"/>
+			<node name="title" value="FBReader - Добавление книги в библиотеку" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Поиск по тексту"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="Игнорировать регистр букв"/>
-			<node name="wholeText" value="По всему тексту"/>
-			<node name="backward" value="Назад"/>
-			<node name="currentSection" value="Только в этом разделе"/>
+			<node name="title" value="Поиск по тексту" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="Игнорировать регистр букв" />
+			<node name="wholeText" value="С начала текста" />
+			<node name="backward" value="Назад" />
+			<node name="currentSection" value="Только в этом разделе" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" value="Поиск в сети" />
+			<node name="bookTitle" value="Название книги" />
+			<node name="author" value="Автор" />
+			<node name="category" value="Категория" />
+			<node name="series" value="Серия" />
+			<node name="description" value="Описание" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Перейти на страницу"/>
-			<node name="pageNumber" value="Номер страницы"/>
+			<node name="title" value="Перейти на страницу" />
+			<node name="pageNumber" value="Номер страницы" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Редактирование/копирование категории"/>
+			<node name="title" value="Редактирование/копирование категории" />
 			<node name="editOrClone" value="Действие">
-				<node name="edit" value="Редактирование"/>
-				<node name="clone" value="Копирование"/>
+				<node name="edit" value="Редактирование" />
+				<node name="clone" value="Копирование" />
 			</node>
-			<node name="name" value="Название"/>
-			<node name="includeSubtags" value="Включая подкатегории"/>
+			<node name="name" value="Название" />
+			<node name="includeSubtags" value="Включая подкатегории" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Удаление книги"/>
-			<node name="message" value="Удалить книгу &#10;&#171;%s&#187;&#10; из библиотеки?"/>
+			<node name="title" value="Удаление книги" />
+			<node name="message" value="Удалить книгу&#10;«%s»&#10;из библиотеки?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Удаление категории"/>
-			<node name="message" value="Удалить категорию &#171;%s&#187;?"/>
+			<node name="title" value="Удаление категории" />
+			<node name="message" value="Удалить категорию «%s»?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Ошибка"/>
-			<node name="message" value="Не могу открыть:&#10;%s"/>
+			<node name="title" value="Ошибка" />
+			<node name="message" value="Не могу открыть:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Ошибка"/>
-			<node name="message" value="Извините, нет файла с информацией"/>
+			<node name="title" value="Ошибка" />
+			<node name="message" value="Извините, нет файла с информацией" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Ошибка"/>
-			<node name="message" value="Название категории не может быть пустым"/>
+			<node name="title" value="Ошибка" />
+			<node name="message" value="Название категории не может быть пустым" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Ошибка"/>
-			<node name="message" value="В названии категории не может быть запятой"/>
+			<node name="title" value="Ошибка" />
+			<node name="message" value="В названии категории не может быть запятой" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" value="Не указаны библиотеки для поиска" />
+		</node>
+		<node name="downloadError">
+			<node name="title" value="Ошибка при загрузке" />
+			<node name="message" value="Не удалось загрузить книгу из сети" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Загрузка книги. Подождите, пожалуйста..."/>
-			<node name="loadingBookList" value="Загрузка списка книг. Подождите, пожалуйста..."/>
-			<node name="migrate" value="Переход на новую версию. Подождите, пожалуйста..."/>
+			<node name="loadingBook" value="Загрузка книги. Подождите, пожалуйста..." />
+			<node name="loadingBookList" value="Загрузка списка книг. Подождите, пожалуйста..." />
+			<node name="migrate" value="Переход на новую версию. Подождите, пожалуйста..." />
+			<node name="downloadBookList" value="Загрузка списка книг. Подождите, пожалуйста..." />
+			<node name="downloadBook" value="Загрузка книги. Подождите, пожалуйста..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="текста по умолчанию"/>
-		<node name="Regular Paragraph" value="обычного текста"/>
-		<node name="Title" value="заголовка"/>
-		<node name="Section Title" value="названия главы"/>
-		<node name="Poem Title" value="названия стихотворения"/>
-		<node name="Subtitle" value="подзаголовка"/>
-		<node name="Annotation" value="аннотации"/>
-		<node name="Epigraph" value="эпиграфа"/>
-		<node name="Stanza" value="строфы"/>
-		<node name="Verse" value="стихов"/>
-		<node name="Preformatted text" value="текста внутри &lt;pre&gt;"/>
-		<node name="Image" value="рисунка"/>
-		<node name="Cite" value="цитаты"/>
-		<node name="Author" value="имени автора"/>
-		<node name="Date" value="даты"/>
-		<node name="Internal Hyperlink" value="ссылки"/>
-		<node name="Footnote" value="сноски"/>
-		<node name="Emphasis" value="выделения (emphasis)"/>
-		<node name="Strong" value="выделения (strong)"/>
-		<node name="Subscript" value="нижнего индекса"/>
-		<node name="Superscript" value="верхнего индекса"/>
-		<node name="Code" value="текста программы"/>
-		<node name="StrikeThrough" value="зачеркнутого текста"/>
-		<node name="Contents Table" value="оглавления"/>
-		<node name="Author in Library" value="имени автора в библиотеке"/>
-		<node name="Book in Library" value="библиотеки"/>
-		<node name="Recent Book List" value="списка книг"/>
-		<node name="Italic" value="курсива"/>
-		<node name="Bold" value="жирного текста"/>
-		<node name="Definition" value="определения"/>
-		<node name="Definition Description" value="текста определения"/>
-		<node name="Header 1" value="текста внутри &lt;h1&gt;"/>
-		<node name="Header 2" value="текста внутри &lt;h2&gt;"/>
-		<node name="Header 3" value="текста внутри &lt;h3&gt;"/>
-		<node name="Header 4" value="текста внутри &lt;h4&gt;"/>
-		<node name="Header 5" value="текста внутри &lt;h5&gt;"/>
-		<node name="Header 6" value="текста внутри &lt;h6&gt;"/>
-		<node name="External Hyperlink" value="внешней ссылки"/>
+		<node name="Base" value="текста по умолчанию" />
+		<node name="Regular Paragraph" value="обычного текста" />
+		<node name="Title" value="заголовка" />
+		<node name="Section Title" value="названия главы" />
+		<node name="Poem Title" value="названия стихотворения" />
+		<node name="Subtitle" value="подзаголовка" />
+		<node name="Annotation" value="аннотации" />
+		<node name="Epigraph" value="эпиграфа" />
+		<node name="Stanza" value="строфы" />
+		<node name="Verse" value="стихов" />
+		<node name="Preformatted text" value="текста внутри &lt;pre&gt;" />
+		<node name="Image" value="рисунка" />
+		<node name="Cite" value="цитаты" />
+		<node name="Author" value="имени автора" />
+		<node name="Date" value="даты" />
+		<node name="Internal Hyperlink" value="ссылки" />
+		<node name="Footnote" value="сноски" />
+		<node name="Emphasis" value="выделения (emphasis)" />
+		<node name="Strong" value="выделения (strong)" />
+		<node name="Subscript" value="нижнего индекса" />
+		<node name="Superscript" value="верхнего индекса" />
+		<node name="Code" value="текста программы" />
+		<node name="StrikeThrough" value="зачеркнутого текста" />
+		<node name="Contents Table" value="оглавления" />
+		<node name="Library Entry" value="библиотеки" />
+		<node name="Recent Book List" value="списка книг" />
+		<node name="Italic" value="курсива" />
+		<node name="Bold" value="жирного текста" />
+		<node name="Definition" value="определения" />
+		<node name="Definition Description" value="текста определения" />
+		<node name="Header 1" value="текста внутри &lt;h1&gt;" />
+		<node name="Header 2" value="текста внутри &lt;h2&gt;" />
+		<node name="Header 3" value="текста внутри &lt;h3&gt;" />
+		<node name="Header 4" value="текста внутри &lt;h4&gt;" />
+		<node name="Header 5" value="текста внутри &lt;h5&gt;" />
+		<node name="Header 6" value="текста внутри &lt;h6&gt;" />
+		<node name="External Hyperlink" value="внешней ссылки" />
+		<node name="Link to Another Book" value="ссылки на книгу" />
 	</node>
 	<node name="external">
-		<node name="browser" value="браузере"/>
-		<node name="defaultBrowser" value="браузере"/>
+		<node name="browser" value="браузере" />
+		<node name="defaultBrowser" value="браузере" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="неизвестная ошибка"/>
-		<node name="unsupportedCompressionMethod" value="неподдерживаемый метод сжатия"/>
-		<node name="encriptedFile" value="файл защищен DRM"/>
+		<node name="unknown" value="неизвестная ошибка" />
+		<node name="unsupportedCompressionMethod" value="неподдерживаемый метод сжатия" />
+		<node name="encriptedFile" value="файл защищен DRM" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" value="Поиск в сетевых библиотеках" />
+		<node name="startText" value="Введите строку для поиска в поле на панели инструментов и нажмите &lt;Return&gt;." />
+		<node name="notFound" value="Не удалось найти подходящих книг." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Библиотека"/>
-		<node name="allBooks" value="Все книги"/>
-		<node name="booksWithoutTags" value="Книги без категорий"/>
-		<node name="noBooks" value="В библиотеке нет ни одной книги. Введите, пожалуйста, список каталогов, содержащих книги в диалоге настроек (вкладка &#171;Библиотека&#187;, поле &#171;Путь к книгам&#187;), либо добавьте книги вручную с помощью кнопки &#171;Добавить книгу&#187;."/>
+		<node name="caption" value="Библиотека" />
+		<node name="allBooks" value="Все книги" />
+		<node name="booksWithoutTags" value="Книги без категорий" />
+		<node name="noBooks" value="В библиотеке нет ни одной книги. Введите, пожалуйста, список каталогов, содержащих книги в диалоге настроек (вкладка «Библиотека», поле «Путь к книгам»), либо добавьте книги вручную с помощью кнопки «Добавить книгу»." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/sv.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/sv.xml
--- fbreader-0.8.17/fbreader/data/resources/sv.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/sv.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,423 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Swedish FBReader resources, by Daniel Nylander -->
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Bokinformation..."/>
-	  <node name="toc" value="Innehållsförteckning"/>
+	<node name="menu">
+		<node name="bookInfo" value="Bokinformation..." />
+		<node name="toc" value="Innehållsförteckning" />
 		<node name="library" value="Bibliotek">
-			<node name="showLibrary" value="Öppna"/>
-			<node name="previousBook" value="Föregående bok"/>
-			<node name="showRecent" value="Tidigare"/>
-			<node name="addBook" value="Lägg till bok..."/>
-			<node name="showHelp" value="Om FBReader"/>
+			<node name="showLibrary" value="Öppna" />
+			<node name="previousBook" value="Föregående bok" />
+			<node name="showRecent" value="Tidigare" />
+			<node name="addBook" value="Lägg till bok..." />
+			<node name="showHelp" value="Om FBReader" />
 		</node>
 		<node name="navigate" value="Navigation">
-			<node name="gotoHome" value="Gå till början av dokumentet"/>
-			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
-			<node name="gotoSectionStart" value="Gå till början av textavsnitt"/>
-			<node name="gotoSectionEnd" value="Gå till slutet av textavsnitt"/>
-			<node name="nextTOCSection" value="Gå till nästa post i innehållsförteckning"/>
-			<node name="previousTOCSection" value="Gå till föregående post i innehållsförteckning"/>
-			<node name="undo" value="Gå bakåt"/>
-			<node name="redo" value="Gå framåt"/>
+			<node name="gotoHome" value="Gå till början av dokumentet" />
+			<node name="gotoPageNumber" toBeTranslated="true" value="Go to Page..." />
+			<node name="gotoSectionStart" value="Gå till början av textavsnitt" />
+			<node name="gotoSectionEnd" value="Gå till slutet av textavsnitt" />
+			<node name="nextTOCSection" value="Gå till nästa post i innehållsförteckning" />
+			<node name="previousTOCSection" value="Gå till föregående post i innehållsförteckning" />
+			<node name="undo" value="Gå bakåt" />
+			<node name="redo" value="Gå framåt" />
 		</node>
 		<node name="selection" value="Markering">
-			<node name="copyToClipboard" value="Kopiera till urklipp"/>
-			<node name="openInDictionary" value="Öppna i ordbok"/>
-			<node name="clearSelection" value="Töm"/>
+			<node name="copyToClipboard" value="Kopiera till urklipp" />
+			<node name="openInDictionary" value="Öppna i ordbok" />
+			<node name="clearSelection" value="Töm" />
 		</node>
 		<node name="search" value="Sök">
-			<node name="search" value="Sök text..."/>
-			<node name="findNext" value="Sök nästa"/>
-			<node name="findPrevious" value="Sök föregående"/>
+			<node name="search" value="Sök text..." />
+			<node name="findNext" value="Sök nästa" />
+			<node name="findPrevious" value="Sök föregående" />
 		</node>
 		<node name="view" value="Visa">
-			<node name="rotate" value="Rotera skärm"/>
-			<node name="toggleFullscreen" value="Helskärm"/>
-			<node name="toggleIndicator" value="Växla indikator"/>
+			<node name="rotate" value="Rotera skärm" />
+			<node name="toggleFullscreen" value="Helskärm" />
+			<node name="toggleIndicator" value="Växla indikator" />
 		</node>
-		<node name="preferences" value="Inställningar..."/>
-		<node name="quit" value="Stäng"/>
+		<node name="preferences" value="Inställningar..." />
+		<node name="quit" value="Stäng" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Visa biblioteksträd"/>
-		<node name="showRecent" value="Visa tidigare bokhistorik"/>
-		<node name="addBook" value="Lägg till fil till bibliotek"/>
-		<node name="gotoHome" value="Gå till början av text"/>
-		<node name="undo" value="Gå bakåt"/>
-		<node name="redo" value="Gå framåt"/>
-		<node name="toc" value="Innehållsförteckning"/>
-		<node name="search" value="Textsökning"/>
-		<node name="findNext" value="Sök nästa"/>
-		<node name="findPrevious" value="Sök föregående"/>
-		<node name="bookInfo" value="Visa bokinformation"/>
-		<node name="preferences" value="Visa inställningar"/>
-		<node name="rotate" value="Rotera text"/>
-		<node name="showHelp" value="Om FBReader"/>
+		<node name="showReading" toBeTranslated="true" value="Show Reading Mode" />
+		<node name="showLibrary" value="Visa biblioteksträd">
+			<node name="popup" toBeTranslated="true" value="Show Recent Books List" />
+		</node>
+		<node name="showRecent" value="Visa tidigare bokhistorik" />
+		<node name="byAuthor" toBeTranslated="true" value="Organize Books by Author" />
+		<node name="byTag" toBeTranslated="true" value="Organize Books by Tag" />
+		<node name="addBook" value="Lägg till fil till bibliotek" />
+		<node name="showNetLibrary" toBeTranslated="true" value="Search in Network Libraries" />
+		<node name="searchOnNetwork" toBeTranslated="true" value="Network Search" />
+		<node name="advancedSearchOnNetwork" toBeTranslated="true" value="Advanced Network Search" />
+		<node name="gotoHome" value="Gå till början av text" />
+		<node name="undo" value="Gå bakåt" />
+		<node name="redo" value="Gå framåt" />
+		<node name="gotoPageNumberWithParameter" toBeTranslated="true" value="Go to Page" />
+		<node name="toc" value="Innehållsförteckning" />
+		<node name="search" value="Textsökning" />
+		<node name="findNext" value="Sök nästa" />
+		<node name="findPrevious" value="Sök föregående" />
+		<node name="bookInfo" value="Visa bokinformation" />
+		<node name="preferences" value="Visa inställningar" />
+		<node name="rotate" value="Rotera text" />
+		<node name="showHelp" value="Om FBReader" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Gå!"/>
-			<node name="thisOnly" value="This only" toBeTranslated="true"/>
-			<node name="withSubtags" value="With subtags" toBeTranslated="true"/>
+			<node name="go" value="&amp;Gå!" />
+			<node name="thisOnly" toBeTranslated="true" value="This only" />
+			<node name="withSubtags" toBeTranslated="true" value="With subtags" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Alternativ"/>
+			<node name="title" value="FBReader - Alternativ" />
 			<node name="tab">
 				<node name="Library" value="Bibliotek">
-					<node name="bookPath" value="Boksökväg"/>
-					<node name="lookInSubdirectories" value="Leta efter böcker i underkataloger"/>
-					<node name="recentListSize" value="Storlek på lista över tidigare böcker"/>
-					<node name="showTags" value="Show Tag Hierarchies" toBeTranslated="true"/>
-					<node name="showAllBooksList" value="Show All Books Branch" toBeTranslated="true"/>
+					<node name="bookPath" value="Boksökväg" />
+					<node name="lookInSubdirectories" value="Leta efter böcker i underkataloger" />
+					<node name="collectBooksWithoutMetaInfo" toBeTranslated="true" value="Collect Books without MetaInfo" />
+					<node name="downloadDirectory" toBeTranslated="true" value="Directory for Downloaded Books" />
+					<node name="showAllBooksTag" toBeTranslated="true" value="All Books Branch in Book Tree" />
+				</node>
+				<node name="NetworkLibrary" toBeTranslated="true" value="Network Search">
+					<node name="useProxy" toBeTranslated="true" value="Use Proxy" />
+					<node name="proxyHost" toBeTranslated="true" value="Proxy Host" />
+					<node name="proxyPort" toBeTranslated="true" value="Proxy Port" />
+					<node name="timeout" toBeTranslated="true" value="Network Operations Timeout, seconds" />
 				</node>
 				<node name="Language" value="Språk">
-					<node name="autoDetect" value="Upptäck automatiskt språk och kodning"/>
-					<node name="defaultLanguage" value="Standardspråk"/>
-					<node name="defaultEncodingSet" value="Standardteckenuppsättning"/>
-					<node name="defaultEncoding" value="Standardkodning"/>
-					<node name="useWindows1252Hack" value="Använd windows-1252 istället för iso-8859-1"/>
+					<node name="autoDetect" value="Upptäck automatiskt språk och kodning" />
+					<node name="defaultLanguage" value="Standardspråk" />
+					<node name="defaultEncodingSet" value="Standardteckenuppsättning" />
+					<node name="defaultEncoding" value="Standardkodning" />
+					<node name="useWindows1252Hack" value="Använd windows-1252 istället för iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Indikator">
-					<node name="show" value="Visa positionsindikator"/>
-					<node name="height" value="Indikatorns höjd"/>
-					<node name="offset" value="Offset från text"/>
-					<node name="pageNumber" value="Visa position som siffror"/>
-					<node name="time" value="Visa tid"/>
-					<node name="fontSize" value="Typsnittsstorlek"/>
-					<node name="tocMarks" value="Visa förteckningsmarkeringar"/>
-					<node name="navigation" value="Aktivera navigering"/>
+					<node name="type" toBeTranslated="true" value="Show as">
+						<node name="osScrollbar" toBeTranslated="true" value="OS Scrollbar" />
+						<node name="fbIndicator" toBeTranslated="true" value="Old Style Indicator" />
+						<node name="none" toBeTranslated="true" value="Don&apos;t Show" />
+					</node>
+					<node name="height" value="Indikatorns höjd" />
+					<node name="offset" value="Offset från text" />
+					<node name="pageNumber" value="Visa position som siffror" />
+					<node name="time" value="Visa tid" />
+					<node name="fontSize" value="Typsnittsstorlek" />
+					<node name="tocMarks" value="Visa förteckningsmarkeringar" />
+					<node name="navigation" value="Aktivera navigering" />
 				</node>
 				<node name="Scrolling" value="Rullning">
 					<node name="optionsFor" value="Alternativ för">
-						<node name="large" value="Large Scrollings" toBeTranslated="true"/>
-						<node name="small" value="Small Scrollings" toBeTranslated="true"/>
-						<node name="mouse" value="Mouse Scrollings" toBeTranslated="true"/>
-						<node name="tap" value="Tap Scrollings" toBeTranslated="true"/>
+						<node name="large" toBeTranslated="true" value="Large Scrollings" />
+						<node name="small" toBeTranslated="true" value="Small Scrollings" />
+						<node name="mouse" toBeTranslated="true" value="Mouse Scrollings" />
+						<node name="tap" toBeTranslated="true" value="Tap Scrollings" />
 					</node>
-					<node name="delay" value="Fördröjning mellan rullningar, ms"/>
+					<node name="delay" value="Fördröjning mellan rullningar, ms" />
 					<node name="mode" value="Rullningsläge">
-						<node name="noOverlapping" value="Ingen överlappning"/>
-						<node name="keepLines" value="Behåll rader"/>
-						<node name="scrollLines" value="Rulla rader"/>
-						<node name="scrollPercentage" value="Rulla procentandel"/>
-						<node name="disable" value="Inaktivera"/>
+						<node name="noOverlapping" value="Ingen överlappning" />
+						<node name="keepLines" value="Behåll rader" />
+						<node name="scrollLines" value="Rulla rader" />
+						<node name="scrollPercentage" value="Rulla procentandel" />
+						<node name="disable" value="Inaktivera" />
 					</node>
-					<node name="linesToKeep" value="Rader att behålla"/>
-					<node name="linesToScroll" value="Rader att rulla"/>
-					<node name="percentToScroll" value="Procentandel att rulla"/>
-					<node name="fingerOnly" value="Scroll on Finger Tap Only" toBeTranslated="true"/>
+					<node name="linesToKeep" value="Rader att behålla" />
+					<node name="linesToScroll" value="Rader att rulla" />
+					<node name="percentToScroll" value="Procentandel att rulla" />
+					<node name="fingerOnly" toBeTranslated="true" value="Scroll on Finger Tap Only" />
 				</node>
 				<node name="Selection" value="Markering">
-					<node name="enableSelection" value="Aktivera textmarkering"/>
+					<node name="enableSelection" value="Aktivera textmarkering" />
+				</node>
+				<node name="CSS" toBeTranslated="true" value="CSS">
+					<node name="overrideSpecifiedFonts" toBeTranslated="true" value="Always Use My Own Fonts" />
 				</node>
 				<node name="Margins" value="Marginaler">
-					<node name="left" value="Vänstermarginal"/>
-					<node name="right" value="Högermarginal"/>
-					<node name="top" value="Övermarginal"/>
-					<node name="bottom" value="Nedermarginal"/>
+					<node name="left" value="Vänstermarginal" />
+					<node name="right" value="Högermarginal" />
+					<node name="top" value="Övermarginal" />
+					<node name="bottom" value="Nedermarginal" />
 				</node>
 				<node name="Format" value="Formatering">
-					<node name="optionsFor" value="Alternativ för"/>
+					<node name="optionsFor" value="Alternativ för" />
 					<node name="lineSpacing" value="Radmellanrum">
-						<node name="unchanged" value="&lt;oförändrad&gt;"/>
+						<node name="unchanged" value="&lt;oförändrad&gt;" />
 					</node>
-					<node name="firstLineIndent" value="Indentera första raden"/>
+					<node name="firstLineIndent" value="Indentera första raden" />
 					<node name="alignment" value="Justering">
-						<node name="left" value="Vänster"/>
-						<node name="right" value="Höger"/>
-						<node name="center" value="Centrera"/>
-						<node name="justify" value="Justera"/>
-						<node name="unchanged" value="&lt;oförändrad&gt;"/>
+						<node name="left" value="Vänster" />
+						<node name="right" value="Höger" />
+						<node name="center" value="Centrera" />
+						<node name="justify" value="Justera" />
+						<node name="unchanged" value="&lt;oförändrad&gt;" />
 					</node>
-					<node name="spaceBefore" value="Blanksteg före"/>
-					<node name="spaceAfter" value="Blanksteg efter"/>
-					<node name="leftIndent" value="Vänsterindentering"/>
-					<node name="rightIndent" value="Högerindentering"/>
+					<node name="spaceBefore" value="Blanksteg före" />
+					<node name="spaceAfter" value="Blanksteg efter" />
+					<node name="startIndent" toBeTranslated="true" value="Line Start Indent" />
+					<node name="endIndent" toBeTranslated="true" value="Line End Indent" />
 				</node>
 				<node name="Styles" value="Stilar">
-					<node name="optionsFor" value="Alternativ för"/>
+					<node name="optionsFor" value="Alternativ för" />
 					<node name="fontFamily" value="Familj">
-						<node name="unchanged" value="&lt;oförändrad&gt;"/>
+						<node name="unchanged" value="&lt;oförändrad&gt;" />
 					</node>
-					<node name="fontSize" value="Storlek"/>
-					<node name="fontSizeDifference" value="Storleksskillnad"/>
-					<node name="bold" value="Fet"/>
-					<node name="italic" value="Kursiv"/>
-					<node name="allowHyphenations" value="Tillåt avstavningar"/>
-					<node name="autoHyphenations" value="Automatiska avstavningar"/>
+					<node name="fontSize" value="Storlek" />
+					<node name="fontSizeDifference" value="Storleksskillnad" />
+					<node name="bold" value="Fet" />
+					<node name="italic" value="Kursiv" />
+					<node name="allowHyphenations" value="Tillåt avstavningar" />
+					<node name="autoHyphenations" value="Automatiska avstavningar" />
 				</node>
 				<node name="Rotation" value="Rotering">
 					<node name="direction" value="Roteringstyp">
-						<node name="disabled" value="Inaktiverad"/>
-						<node name="clockwise" value="90 grader medsols"/>
-						<node name="counterclockwise" value="90 grader motsols"/>
-						<node name="180" value="180 grader"/>
-						<node name="cycle" value="Växla genom alla fyra riktningar"/>
+						<node name="disabled" value="Inaktiverad" />
+						<node name="clockwise" value="90 grader medsols" />
+						<node name="counterclockwise" value="90 grader motsols" />
+						<node name="180" value="180 grader" />
+						<node name="cycle" value="Växla genom alla fyra riktningar" />
 					</node>
 				</node>
 				<node name="Colors" value="Färger">
 					<node name="colorFor" value="Färg för">
-						<node name="background" value="Bakgrund"/>
-						<node name="selectionBackground" value="Markeringsbakgrund"/>
-						<node name="text" value="Vanlig text"/>
-						<node name="internalLink" value="Text för intern hyperlänk"/>
-						<node name="externalLink" value="Text för extern hyperlänk"/>
-						<node name="highlighted" value="Färgmarkerad text"/>
-						<node name="treeLines" value="Trädrader"/>
-						<node name="indicator" value="Positionsindikator"/>
+						<node name="background" value="Bakgrund" />
+						<node name="selectionBackground" value="Markeringsbakgrund" />
+						<node name="text" value="Vanlig text" />
+						<node name="internalLink" value="Text för intern hyperlänk" />
+						<node name="externalLink" value="Text för extern hyperlänk" />
+						<node name="bookLink" toBeTranslated="true" value="Link to Another Book" />
+						<node name="highlighted" value="Färgmarkerad text" />
+						<node name="treeLines" value="Trädrader" />
+						<node name="indicator" value="Positionsindikator" />
 					</node>
 				</node>
 				<node name="Keys" value="Tangenter">
-					<node name="grabSystemKeys" value="Fånga systemtangenter"/>
-					<node name="separate" value="Tangentbindningar beroende av orientering"/>
-					<node name="orientation" value="Orientering"/>
+					<node name="grabSystemKeys" value="Fånga systemtangenter" />
+					<node name="separate" value="Tangentbindningar beroende av orientering" />
+					<node name="orientation" value="Orientering" />
 					<node name="action">
-						<node name="none" value="Ingen"/>
-						<node name="showLibrary" value="Visa bibliotek"/>
-						<node name="showRecent" value="Visa tidigare böcker"/>
-						<node name="previousBook" value="Öppna föregående bok"/>
-						<node name="toc" value="Visa innehållsförteckning"/>
-						<node name="gotoHome" value="Gå hem"/>
-						<node name="gotoSectionStart" value="Gå till början av avsnitt"/>
-						<node name="gotoSectionEnd" value="Gå till slutet av avsnitt"/>
-						<node name="nextTOCSection" value="Gå till nästa avsnitt i förteckning"/>
-						<node name="previousTOCSection" value="Gå till föregående avsnitt i förteckning"/>
-						<node name="largeScrollForward" value="Stor rullning framåt"/>
-						<node name="largeScrollBackward" value="Stor rullning bakåt"/>
-						<node name="smallScrollForward" value="Liten rullning framåt"/>
-						<node name="smallScrollBackward" value="Liten rullning bakåt"/>
-						<node name="undo" value="Ångra"/>
-						<node name="redo" value="Gör om"/>
-						<node name="copyToClipboard" value="Kopiera markerad text till urklipp"/>
-						<node name="openInDictionary" value="Öppna markerad text i ordbok"/>
-						<node name="clearSelection" value="Töm markering"/>
-						<node name="search" value="Sök"/>
-						<node name="findPrevious" value="Sök föregående"/>
-						<node name="findNext" value="Sök nästa"/>
-						<node name="increaseFont" value="Öka typsnittsstorlek"/>
-						<node name="decreaseFont" value="Minska typsnittsstorlek"/>
-						<node name="toggleIndicator" value="Växla positionsindikator"/>
-						<node name="toggleFullscreen" value="Växla helskärmsläge"/>
-						<node name="onFullscreen" value="Växla till helskärmsläge"/>
-						<node name="rotate" value="Rotera skärm"/>
-						<node name="preferences" value="Visa alternativdialog"/>
-						<node name="bookInfo" value="Visa bokinformation"/>
-						<node name="addBook" value="Lägg till bok"/>
-						<node name="cancel" value="Avbryt"/>
-						<node name="quit" value="Avsluta"/>
+						<node name="none" value="Ingen" />
+						<node name="showLibrary" value="Visa bibliotek" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="Visa tidigare böcker" />
+						<node name="previousBook" value="Öppna föregående bok" />
+						<node name="toc" value="Visa innehållsförteckning" />
+						<node name="gotoHome" value="Gå hem" />
+						<node name="gotoSectionStart" value="Gå till början av avsnitt" />
+						<node name="gotoSectionEnd" value="Gå till slutet av avsnitt" />
+						<node name="nextTOCSection" value="Gå till nästa avsnitt i förteckning" />
+						<node name="previousTOCSection" value="Gå till föregående avsnitt i förteckning" />
+						<node name="largeScrollForward" value="Stor rullning framåt" />
+						<node name="largeScrollBackward" value="Stor rullning bakåt" />
+						<node name="smallScrollForward" value="Liten rullning framåt" />
+						<node name="smallScrollBackward" value="Liten rullning bakåt" />
+						<node name="undo" value="Ångra" />
+						<node name="redo" value="Gör om" />
+						<node name="copyToClipboard" value="Kopiera markerad text till urklipp" />
+						<node name="openInDictionary" value="Öppna markerad text i ordbok" />
+						<node name="clearSelection" value="Töm markering" />
+						<node name="search" value="Sök" />
+						<node name="findPrevious" value="Sök föregående" />
+						<node name="findNext" value="Sök nästa" />
+						<node name="increaseFont" value="Öka typsnittsstorlek" />
+						<node name="decreaseFont" value="Minska typsnittsstorlek" />
+						<node name="toggleIndicator" value="Växla positionsindikator" />
+						<node name="toggleFullscreen" value="Växla helskärmsläge" />
+						<node name="rotate" value="Rotera skärm" />
+						<node name="preferences" value="Visa alternativdialog" />
+						<node name="bookInfo" value="Visa bokinformation" />
+						<node name="addBook" value="Lägg till bok" />
+						<node name="cancel" value="Avbryt" />
+						<node name="quit" value="Avsluta" />
 					</node>
-					<node name="quitOnCancel" value="Avsluta programmet vid avbryt"/>
-					<node name="keyDelay" value="Delay Between Accepted Key Pressings" toBeTranslated="true"/>
+					<node name="quitOnCancel" value="Avsluta programmet vid avbryt" />
+					<node name="keyDelay" toBeTranslated="true" value="Delay Between Accepted Key Pressings" />
 				</node>
 				<node name="Config" value="Konfiguration">
-					<node name="autoSave" value="Spara tillstånd automatiskt"/>
-					<node name="timeout" value="Tidsgräns mellan sparningar, sekunder"/>
+					<node name="autoSave" value="Spara tillstånd automatiskt" />
+					<node name="timeout" value="Tidsgräns mellan sparningar, sekunder" />
 				</node>
 				<node name="Dictionary" value="Ordbok">
-					<node name="enableIntegration" value="Aktivera integration med %s"/>
-					<node name="defaultText" value="Aktivera integration med ordbok"/>
-					<node name="choice" value="Integrera med"/>
-					<node name="singleClickOpen" value="Öppna med ett klick"/>
+					<node name="enableIntegration" value="Aktivera integration med %s" />
+					<node name="defaultText" value="Aktivera integration med ordbok" />
+					<node name="choice" value="Integrera med" />
+					<node name="singleClickOpen" value="Öppna med ett klick" />
 				</node>
 				<node name="Web" value="Webb">
-					<node name="enableIntegration" value="Öppna externa länkar med %s"/>
-					<node name="defaultText" value="Öppna externa länkar i webbläsare"/>
-					<node name="choice" value="Använd webbläsare"/>
-					<node name="command" value="Kommando att köra"/>
+					<node name="enableIntegration" value="Öppna externa länkar med %s" />
+					<node name="defaultText" value="Öppna externa länkar i webbläsare" />
+					<node name="choice" value="Använd webbläsare" />
+					<node name="command" value="Kommando att köra" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Åtgärd vid tangentsläpp, inte tangenttryck"/>
-					<node name="minStylusPressure" value="Minimalt pentryck"/>
-					<node name="maxStylusPressure" value="Maximalt pentryck"/>
+					<node name="keyActionOnRelease" value="Åtgärd vid tangentsläpp, inte tangenttryck" />
+					<node name="minStylusPressure" value="Minimalt pentryck" />
+					<node name="maxStylusPressure" value="Maximalt pentryck" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Bokinformation"/>
+			<node name="title" value="FBReader - Bokinformation" />
 			<node name="tab">
 				<node name="Common" value="Allmänt">
-					<node name="file" value="Fil"/>
-					<node name="title" value="Titel"/>
-					<node name="authorDisplayName" value="Författare (Visningsnamn)"/>
-					<node name="authorSortKey" value="Författare (Sorteringsnyckel)"/>
-					<node name="language" value="Språk"/>
-					<node name="encodingSet" value="Teckenuppsättning"/>
-					<node name="encoding" value="Kodning"/>
+					<node name="file" value="Fil" />
+					<node name="title" value="Titel" />
+					<node name="authorDisplayName" value="Författare (Visningsnamn)" />
+					<node name="authorSortKey" value="Författare (Sorteringsnyckel)" />
+					<node name="language" value="Språk" />
+					<node name="encodingSet" value="Teckenuppsättning" />
+					<node name="encoding" value="Kodning" />
 				</node>
 				<node name="Series" value="Serier">
-					<node name="seriesTitle" value="Serietitel"/>
-					<node name="bookNumber" value="Boknummer"/>
+					<node name="seriesTitle" value="Serietitel" />
+					<node name="bookNumber" value="Boknummer" />
 				</node>
-				<node name="Tags" value="Tags" toBeTranslated="true">
-					<node name="tags" value="Tag List" toBeTranslated="true"/>
+				<node name="Tags" toBeTranslated="true" value="Tags">
+					<node name="tags" toBeTranslated="true" value="Tag List" />
 				</node>
 				<node name="Text" value="Text">
-					<node name="breakType" value="Bryt stycke vid"/>
-					<node name="ignoreIndent" value="Ignorera indentering mindre än"/>
-					<node name="buildTOC" value="Bygg innehållsförteckning"/>
-					<node name="emptyLines" value="Tomma rader innan nytt avsnitt"/>
+					<node name="breakType" value="Bryt stycke vid" />
+					<node name="ignoreIndent" value="Ignorera indentering mindre än" />
+					<node name="buildTOC" value="Bygg innehållsförteckning" />
+					<node name="emptyLines" value="Tomma rader innan nytt avsnitt" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Bryt stycke vid"/>
-					<node name="ignoreIndent" value="Ignorera indentering mindre än"/>
-					<node name="buildTOC" value="Bygg innehållsförteckning"/>
-					<node name="emptyLines" value="Tomma rader innan nytt avsnitt"/>
+					<node name="breakType" value="Bryt stycke vid" />
+					<node name="ignoreIndent" value="Ignorera indentering mindre än" />
+					<node name="buildTOC" value="Bygg innehållsförteckning" />
+					<node name="emptyLines" value="Tomma rader innan nytt avsnitt" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Lägg till bok till biblioteket"/>
+			<node name="title" value="FBReader - Lägg till bok till biblioteket" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Textsökning"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="&amp;Ignorera skiftläge"/>
-			<node name="wholeText" value="I h&amp;ela texten"/>
-			<node name="backward" value="&amp;Bakåt"/>
-			<node name="currentSection" value="Endast i &amp;detta avsnitt"/>
+			<node name="title" value="Textsökning" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="&amp;Ignorera skiftläge" />
+			<node name="wholeText" value="I h&amp;ela texten" />
+			<node name="backward" value="&amp;Bakåt" />
+			<node name="currentSection" value="Endast i &amp;detta avsnitt" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" toBeTranslated="true" value="Network Search" />
+			<node name="bookTitle" toBeTranslated="true" value="Title" />
+			<node name="author" toBeTranslated="true" value="Author" />
+			<node name="category" toBeTranslated="true" value="Category" />
+			<node name="series" toBeTranslated="true" value="Series" />
+			<node name="description" toBeTranslated="true" value="Description" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Go To Page" toBeTranslated="true"/>
-			<node name="pageNumber" value="Go to Page Number" toBeTranslated="true"/>
+			<node name="title" toBeTranslated="true" value="Go To Page" />
+			<node name="pageNumber" toBeTranslated="true" value="Go to Page Number" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Edit/Clone Tag" toBeTranslated="true"/>
-			<node name="editOrClone" value="Action" toBeTranslated="true">
-				<node name="edit" value="Rename Tag" toBeTranslated="true"/>
-				<node name="clone" value="Clone Tag" toBeTranslated="true"/>
+			<node name="title" toBeTranslated="true" value="Edit/Clone Tag" />
+			<node name="editOrClone" toBeTranslated="true" value="Action">
+				<node name="edit" toBeTranslated="true" value="Rename Tag" />
+				<node name="clone" toBeTranslated="true" value="Clone Tag" />
 			</node>
-			<node name="name" value="Tag Name" toBeTranslated="true"/>
-			<node name="includeSubtags" value="Include Subtags" toBeTranslated="true"/>
+			<node name="name" toBeTranslated="true" value="Tag Name" />
+			<node name="includeSubtags" toBeTranslated="true" value="Include Subtags" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Ta bort bok"/>
-			<node name="message" value="Ta bort boken &#13;&quot;%s&quot;&#13; från biblioteket?"/>
+			<node name="title" value="Ta bort bok" />
+			<node name="message" value="Ta bort boken&#10;&quot;%s&quot;&#10;från biblioteket?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Remove Tag" toBeTranslated="true"/>
-			<node name="message" value="Remove Tag &#8220;%s&#8221;?" toBeTranslated="true"/>
+			<node name="title" toBeTranslated="true" value="Remove Tag" />
+			<node name="message" toBeTranslated="true" value="Remove Tag “%s”?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Fel"/>
-			<node name="message" value="Kunde inte öppna:&#13;%s"/>
+			<node name="title" value="Fel" />
+			<node name="message" value="Kunde inte öppna:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Fel"/>
-			<node name="message" value="Tyvärr, hjälpfilen hittades inte"/>
+			<node name="title" value="Fel" />
+			<node name="message" value="Tyvärr, hjälpfilen hittades inte" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Fel"/>
-			<node name="message" value="Tag name must be a non-empty string" toBeTranslated="true"/>
+			<node name="title" value="Fel" />
+			<node name="message" toBeTranslated="true" value="Tag name must be a non-empty string" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Fel"/>
-			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol" toBeTranslated="true"/>
+			<node name="title" value="Fel" />
+			<node name="message" toBeTranslated="true" value="Tag name must not contain a “,” symbol" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" toBeTranslated="true" value="Empty libraries list" />
+		</node>
+		<node name="downloadError">
+			<node name="title" toBeTranslated="true" value="Error while downloading" />
+			<node name="message" toBeTranslated="true" value="Can&apos;t download this book at the moment" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Läser in bok. Var god vänta..."/>
-			<node name="loadingBookList" value="Läser in boklista. Var god vänta..."/>
-			<node name="migrate" value="Upgrading to the new version. Please, wait..." toBeTranslated="true"/>
+			<node name="loadingBook" value="Läser in bok. Var god vänta..." />
+			<node name="loadingBookList" value="Läser in boklista. Var god vänta..." />
+			<node name="migrate" toBeTranslated="true" value="Upgrading to the new version. Please, wait..." />
+			<node name="downloadBookList" toBeTranslated="true" value="Downloading book list. Please, wait..." />
+			<node name="downloadBook" toBeTranslated="true" value="Downloading book. Please, wait..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="Bas"/>
-		<node name="Regular Paragraph" value="Vanligt stycke"/>
-		<node name="Title" value="Titel"/>
-		<node name="Section Title" value="Avsnittstitel"/>
-		<node name="Poem Title" value="Poem Title"/>
-		<node name="Subtitle" value="Undertext"/>
-		<node name="Annotation" value="Notation"/>
-		<node name="Epigraph" value="Epigram"/>
-		<node name="Stanza" value="Strof"/>
-		<node name="Verse" value="Vers"/>
-		<node name="Preformatted text" value="Förformaterad text"/>
-		<node name="Image" value="Bild"/>
-		<node name="Cite" value="Citat"/>
-		<node name="Author" value="Författare"/>
-		<node name="Date" value="Datum"/>
-		<node name="Internal Hyperlink" value="Intern hyperlänk"/>
-		<node name="Footnote" value="Fotnot"/>
-		<node name="Emphasis" value="Betoning"/>
-		<node name="Strong" value="Stark"/>
-		<node name="Subscript" value="Nedsänkt"/>
-		<node name="Superscript" value="Upphöjt"/>
-		<node name="Code" value="Kod"/>
-		<node name="StrikeThrough" value="Genomstruket"/>
-		<node name="Contents Table" value="Innehållstabell"/>
-		<node name="Author in Library" value="Författare i bibliotek"/>
-		<node name="Book in Library" value="Bok i bibliotek"/>
-		<node name="Recent Book List" value="Lista över tidigare böcker"/>
-		<node name="Italic" value="Kursiv"/>
-		<node name="Bold" value="Fet"/>
-		<node name="Definition" value="Definition"/>
-		<node name="Definition Description" value="Definitionsbeskrivning"/>
-		<node name="Header 1" value="Rubrik 1"/>
-		<node name="Header 2" value="Rubrik 2"/>
-		<node name="Header 3" value="Rubrik 3"/>
-		<node name="Header 4" value="Rubrik 4"/>
-		<node name="Header 5" value="Rubrik 5"/>
-		<node name="Header 6" value="Rubrik 6"/>
-		<node name="External Hyperlink" value="Extern hyperlänk"/>
+		<node name="Base" value="Bas" />
+		<node name="Regular Paragraph" value="Vanligt stycke" />
+		<node name="Title" value="Titel" />
+		<node name="Section Title" value="Avsnittstitel" />
+		<node name="Poem Title" value="Poem Title" />
+		<node name="Subtitle" value="Undertext" />
+		<node name="Annotation" value="Notation" />
+		<node name="Epigraph" value="Epigram" />
+		<node name="Stanza" value="Strof" />
+		<node name="Verse" value="Vers" />
+		<node name="Preformatted text" value="Förformaterad text" />
+		<node name="Image" value="Bild" />
+		<node name="Cite" value="Citat" />
+		<node name="Author" value="Författare" />
+		<node name="Date" value="Datum" />
+		<node name="Internal Hyperlink" value="Intern hyperlänk" />
+		<node name="Footnote" value="Fotnot" />
+		<node name="Emphasis" value="Betoning" />
+		<node name="Strong" value="Stark" />
+		<node name="Subscript" value="Nedsänkt" />
+		<node name="Superscript" value="Upphöjt" />
+		<node name="Code" value="Kod" />
+		<node name="StrikeThrough" value="Genomstruket" />
+		<node name="Contents Table" value="Innehållstabell" />
+		<node name="Library Entry" toBeTranslated="true" value="Library Entry" />
+		<node name="Recent Book List" value="Lista över tidigare böcker" />
+		<node name="Italic" value="Kursiv" />
+		<node name="Bold" value="Fet" />
+		<node name="Definition" value="Definition" />
+		<node name="Definition Description" value="Definitionsbeskrivning" />
+		<node name="Header 1" value="Rubrik 1" />
+		<node name="Header 2" value="Rubrik 2" />
+		<node name="Header 3" value="Rubrik 3" />
+		<node name="Header 4" value="Rubrik 4" />
+		<node name="Header 5" value="Rubrik 5" />
+		<node name="Header 6" value="Rubrik 6" />
+		<node name="External Hyperlink" value="Extern hyperlänk" />
+		<node name="Link to Another Book" toBeTranslated="true" value="Link to Another Book" />
 	</node>
 	<node name="external">
-		<node name="browser" value="Webbläsare"/>
-		<node name="defaultBrowser" value="Standardwebbläsare"/>
+		<node name="browser" value="Webbläsare" />
+		<node name="defaultBrowser" value="Standardwebbläsare" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="Okänt fel"/>
-		<node name="unsupportedCompressionMethod" value="Komprimeringsmetoden stöds inte"/>
-		<node name="encriptedFile" value="DRM-skyddad fil"/>
+		<node name="unknown" value="Okänt fel" />
+		<node name="unsupportedCompressionMethod" value="Komprimeringsmetoden stöds inte" />
+		<node name="encriptedFile" value="DRM-skyddad fil" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" toBeTranslated="true" value="Network Library" />
+		<node name="startText" toBeTranslated="true" value="Please enter a search pattern in the text field on the toolbar and press &lt;Return&gt;." />
+		<node name="notFound" toBeTranslated="true" value="Sorry, no suitable books were found." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Bibliotek"/>
-		<node name="allBooks" value="All Books" toBeTranslated="true"/>
-		<node name="booksWithoutTags" value="Books with no Tags" toBeTranslated="true"/>
-		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button." toBeTranslated="true"/>
+		<node name="caption" value="Bibliotek" />
+		<node name="allBooks" toBeTranslated="true" value="All Books" />
+		<node name="booksWithoutTags" toBeTranslated="true" value="Books with no Tags" />
+		<node name="noBooks" toBeTranslated="true" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (“Library” tab, “Book Path” entry). Alternatively, you can add books to your library using “Add Book” button." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/data/resources/uk.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/data/resources/uk.xml
--- fbreader-0.8.17/fbreader/data/resources/uk.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/data/resources/uk.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,377 +1,423 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Ukrainian FBReader resources, by Valentina Kanevska -->
 <resources>
-  <node name="menu">
-	  <node name="bookInfo" value="Інформація про книгу..."/>
-	  <node name="toc" value="Зміст"/>
+	<node name="menu">
+		<node name="bookInfo" value="Інформація про книгу..." />
+		<node name="toc" value="Зміст" />
 		<node name="library" value="Бібліотека">
-			<node name="showLibrary" value="Відкрити бібліотеку"/>
-			<node name="previousBook" value="Попередня книга"/>
-			<node name="showRecent" value="Прочитані книги"/>
-			<node name="addBook" value="Додати файл..."/>
-			<node name="showHelp" value="Про програму FBReader"/>
+			<node name="showLibrary" value="Відкрити бібліотеку" />
+			<node name="previousBook" value="Попередня книга" />
+			<node name="showRecent" value="Прочитані книги" />
+			<node name="addBook" value="Додати файл..." />
+			<node name="showHelp" value="Про програму FBReader" />
 		</node>
 		<node name="navigate" value="Навігація">
-			<node name="gotoHome" value="На початок книги"/>
-			<node name="gotoPageNumber" value="Go to Page..." toBeTranslated="true"/>
-			<node name="gotoSectionStart" value="На початок розділу"/>
-			<node name="gotoSectionEnd" value="В кінець розділу"/>
-			<node name="nextTOCSection" value="До наступної глави"/>
-			<node name="previousTOCSection" value="До попередньої глави"/>
-			<node name="undo" value="Назад"/>
-			<node name="redo" value="Вперед"/>
+			<node name="gotoHome" value="На початок книги" />
+			<node name="gotoPageNumber" toBeTranslated="true" value="Go to Page..." />
+			<node name="gotoSectionStart" value="На початок розділу" />
+			<node name="gotoSectionEnd" value="В кінець розділу" />
+			<node name="nextTOCSection" value="До наступної глави" />
+			<node name="previousTOCSection" value="До попередньої глави" />
+			<node name="undo" value="Назад" />
+			<node name="redo" value="Вперед" />
 		</node>
 		<node name="selection" value="Помітка">
-			<node name="copyToClipboard" value="Скопіювати до буфера"/>
-			<node name="openInDictionary" value="Дивитися у словнику"/>
-			<node name="clearSelection" value="Зняти помітку"/>
+			<node name="copyToClipboard" value="Скопіювати до буфера" />
+			<node name="openInDictionary" value="Дивитися у словнику" />
+			<node name="clearSelection" value="Зняти помітку" />
 		</node>
 		<node name="search" value="Пошук">
-			<node name="search" value="Шукати..."/>
-			<node name="findNext" value="Шукати далі"/>
-			<node name="findPrevious" value="Шукати раніше"/>
+			<node name="search" value="Шукати..." />
+			<node name="findNext" value="Шукати далі" />
+			<node name="findPrevious" value="Шукати раніше" />
 		</node>
 		<node name="view" value="Зображення">
-			<node name="rotate" value="Повернути"/>
-			<node name="toggleFullscreen" value="На весь екран"/>
-			<node name="toggleIndicator" value="Індикатор позиції"/>
+			<node name="rotate" value="Повернути" />
+			<node name="toggleFullscreen" value="На весь екран" />
+			<node name="toggleIndicator" value="Індикатор позиції" />
 		</node>
-		<node name="preferences" value="Налаштування..."/>
-		<node name="quit" value="Закрити"/>
+		<node name="preferences" value="Налаштування..." />
+		<node name="quit" value="Закрити" />
 	</node>
 	<node name="toolbar">
-		<node name="showLibrary" value="Бібліотека"/>
-		<node name="showRecent" value="Прочитані книги"/>
-		<node name="addBook" value="Додати файл до бібліотеки"/>
-		<node name="gotoHome" value="На початок книги"/>
-		<node name="undo" value="Назад"/>
-		<node name="redo" value="Вперед"/>
-		<node name="toc" value="Зміст"/>
-		<node name="search" value="Пошук"/>
-		<node name="findNext" value="Знайти наступний"/>
-		<node name="findPrevious" value="Знайти попередній"/>
-		<node name="bookInfo" value="Інформацiя про книгу"/>
-		<node name="preferences" value="Налаштування"/>
-		<node name="rotate" value="Повернути текст"/>
-		<node name="showHelp" value="Про програму"/>
+		<node name="showReading" toBeTranslated="true" value="Show Reading Mode" />
+		<node name="showLibrary" value="Бібліотека">
+			<node name="popup" toBeTranslated="true" value="Show Recent Books List" />
+		</node>
+		<node name="showRecent" value="Прочитані книги" />
+		<node name="byAuthor" toBeTranslated="true" value="Organize Books by Author" />
+		<node name="byTag" toBeTranslated="true" value="Organize Books by Tag" />
+		<node name="addBook" value="Додати файл до бібліотеки" />
+		<node name="showNetLibrary" toBeTranslated="true" value="Search in Network Libraries" />
+		<node name="searchOnNetwork" toBeTranslated="true" value="Network Search" />
+		<node name="advancedSearchOnNetwork" toBeTranslated="true" value="Advanced Network Search" />
+		<node name="gotoHome" value="На початок книги" />
+		<node name="undo" value="Назад" />
+		<node name="redo" value="Вперед" />
+		<node name="gotoPageNumberWithParameter" toBeTranslated="true" value="Go to Page" />
+		<node name="toc" value="Зміст" />
+		<node name="search" value="Пошук" />
+		<node name="findNext" value="Знайти наступний" />
+		<node name="findPrevious" value="Знайти попередній" />
+		<node name="bookInfo" value="Інформацiя про книгу" />
+		<node name="preferences" value="Налаштування" />
+		<node name="rotate" value="Повернути текст" />
+		<node name="showHelp" value="Про програму" />
 	</node>
 	<node name="dialog">
 		<node name="button">
-			<node name="go" value="&amp;Шукати"/>
-			<node name="thisOnly" value="This only" toBeTranslated="true"/>
-			<node name="withSubtags" value="With subtags" toBeTranslated="true"/>
+			<node name="go" value="&amp;Шукати" />
+			<node name="thisOnly" toBeTranslated="true" value="This only" />
+			<node name="withSubtags" toBeTranslated="true" value="With subtags" />
 		</node>
 		<node name="OptionsDialog">
-			<node name="title" value="FBReader - Налаштування"/>
+			<node name="title" value="FBReader - Налаштування" />
 			<node name="tab">
 				<node name="Library" value="Бібліотека">
-					<node name="bookPath" value="Каталоги з книгами"/>
-					<node name="lookInSubdirectories" value="Шукати книги в підтеках"/>
-					<node name="recentListSize" value="Розмір списку прочитаних книг"/>
-					<node name="showTags" value="Show Tag Hierarchies" toBeTranslated="true"/>
-					<node name="showAllBooksList" value="Show All Books Branch" toBeTranslated="true"/>
+					<node name="bookPath" value="Каталоги з книгами" />
+					<node name="lookInSubdirectories" value="Шукати книги в підтеках" />
+					<node name="collectBooksWithoutMetaInfo" toBeTranslated="true" value="Collect Books without MetaInfo" />
+					<node name="downloadDirectory" toBeTranslated="true" value="Directory for Downloaded Books" />
+					<node name="showAllBooksTag" toBeTranslated="true" value="All Books Branch in Book Tree" />
+				</node>
+				<node name="NetworkLibrary" toBeTranslated="true" value="Network Search">
+					<node name="useProxy" toBeTranslated="true" value="Use Proxy" />
+					<node name="proxyHost" toBeTranslated="true" value="Proxy Host" />
+					<node name="proxyPort" toBeTranslated="true" value="Proxy Port" />
+					<node name="timeout" toBeTranslated="true" value="Network Operations Timeout, seconds" />
 				</node>
 				<node name="Language" value="Мова">
-					<node name="autoDetect" value="Визначити мову та кодувати автоматично"/>
-					<node name="defaultLanguage" value="Типова мова"/>
-					<node name="defaultEncodingSet" value="Набiр символiв"/>
-					<node name="defaultEncoding" value="Типовий набiр символiв"/>
-					<node name="useWindows1252Hack" value="Використати windows-1252 замiсть iso-8859-1"/>
+					<node name="autoDetect" value="Визначити мову та кодувати автоматично" />
+					<node name="defaultLanguage" value="Типова мова" />
+					<node name="defaultEncodingSet" value="Набiр символiв" />
+					<node name="defaultEncoding" value="Типовий набiр символiв" />
+					<node name="useWindows1252Hack" value="Використати windows-1252 замiсть iso-8859-1" />
 				</node>
 				<node name="Indicator" value="Індикатор">
-					<node name="show" value="Показувати індикатор"/>
-					<node name="height" value="Висота індикатора"/>
-					<node name="offset" value="Відступ від тексту"/>
-					<node name="pageNumber" value="Показувати номери сторінок"/>
-					<node name="time" value="Показувати поточний час"/>
-					<node name="fontSize" value="Розмір шрифта"/>
-					<node name="tocMarks" value="Показувати помітки початку"/>
-					<node name="navigation" value="Реагувати на натискання"/>
+					<node name="type" toBeTranslated="true" value="Show as">
+						<node name="osScrollbar" toBeTranslated="true" value="OS Scrollbar" />
+						<node name="fbIndicator" toBeTranslated="true" value="Old Style Indicator" />
+						<node name="none" toBeTranslated="true" value="Don&apos;t Show" />
+					</node>
+					<node name="height" value="Висота індикатора" />
+					<node name="offset" value="Відступ від тексту" />
+					<node name="pageNumber" value="Показувати номери сторінок" />
+					<node name="time" value="Показувати поточний час" />
+					<node name="fontSize" value="Розмір шрифта" />
+					<node name="tocMarks" value="Показувати помітки початку" />
+					<node name="navigation" value="Реагувати на натискання" />
 				</node>
 				<node name="Scrolling" value="Перегортання">
 					<node name="optionsFor" value="Налаштування перегортання">
-						<node name="large" value="на велику відстань"/>
-						<node name="small" value="на невелику відстань"/>
-						<node name="mouse" value="колесом мишки"/>
-						<node name="tap" value="Tap Scrollings" toBeTranslated="true"/>
+						<node name="large" value="на велику відстань" />
+						<node name="small" value="на невелику відстань" />
+						<node name="mouse" value="колесом мишки" />
+						<node name="tap" toBeTranslated="true" value="Tap Scrollings" />
 					</node>
-					<node name="delay" value="Затримка, мілісекунд"/>
+					<node name="delay" value="Затримка, мілісекунд" />
 					<node name="mode" value="Перегортання">
-						<node name="noOverlapping" value="без перекриття"/>
-						<node name="keepLines" value="перекриває кілька рядків"/>
-						<node name="scrollLines" value="зсовує кілька рядків"/>
-						<node name="scrollPercentage" value="зсовує частину тексту"/>
-						<node name="disable" value="вимкнено"/>
+						<node name="noOverlapping" value="без перекриття" />
+						<node name="keepLines" value="перекриває кілька рядків" />
+						<node name="scrollLines" value="зсовує кілька рядків" />
+						<node name="scrollPercentage" value="зсовує частину тексту" />
+						<node name="disable" value="вимкнено" />
 					</node>
-					<node name="linesToKeep" value="Скільки рядків перекривати"/>
-					<node name="linesToScroll" value="Скільки рядків зсувати"/>
-					<node name="percentToScroll" value="Скільки відсотків зсувати"/>
-					<node name="fingerOnly" value="Scroll on Finger Tap Only" toBeTranslated="true"/>
+					<node name="linesToKeep" value="Скільки рядків перекривати" />
+					<node name="linesToScroll" value="Скільки рядків зсувати" />
+					<node name="percentToScroll" value="Скільки відсотків зсувати" />
+					<node name="fingerOnly" toBeTranslated="true" value="Scroll on Finger Tap Only" />
 				</node>
 				<node name="Selection" value="Помітка">
-					<node name="enableSelection" value="Дозволити помiчати текст"/>
+					<node name="enableSelection" value="Дозволити помiчати текст" />
+				</node>
+				<node name="CSS" toBeTranslated="true" value="CSS">
+					<node name="overrideSpecifiedFonts" toBeTranslated="true" value="Always Use My Own Fonts" />
 				</node>
 				<node name="Margins" value="Відступи">
-					<node name="left" value="Відступ зліва"/>
-					<node name="right" value="Відступ зправа"/>
-					<node name="top" value="Відступ зверху"/>
-					<node name="bottom" value="Відступ знизу"/>
+					<node name="left" value="Відступ зліва" />
+					<node name="right" value="Відступ зправа" />
+					<node name="top" value="Відступ зверху" />
+					<node name="bottom" value="Відступ знизу" />
 				</node>
 				<node name="Format" value="Форматування">
-					<node name="optionsFor" value="Налаштування для"/>
+					<node name="optionsFor" value="Налаштування для" />
 					<node name="lineSpacing" value="Інтервал">
-						<node name="unchanged" value="&lt;не змінювати&gt;"/>
+						<node name="unchanged" value="&lt;не змінювати&gt;" />
 					</node>
-					<node name="firstLineIndent" value="Червоний рядок"/>
+					<node name="firstLineIndent" value="Червоний рядок" />
 					<node name="alignment" value="Вирівнювання">
-						<node name="left" value="ліве"/>
-						<node name="right" value="праве"/>
-						<node name="center" value="по центру"/>
-						<node name="justify" value="по краях"/>
-						<node name="unchanged" value="&lt;не змінювати&gt;"/>
+						<node name="left" value="ліве" />
+						<node name="right" value="праве" />
+						<node name="center" value="по центру" />
+						<node name="justify" value="по краях" />
+						<node name="unchanged" value="&lt;не змінювати&gt;" />
 					</node>
-					<node name="spaceBefore" value="Пропуск перед"/>
-					<node name="spaceAfter" value="Пропуск після"/>
-					<node name="leftIndent" value="Відступ зліва"/>
-					<node name="rightIndent" value="Відступ зправа"/>
+					<node name="spaceBefore" value="Пропуск перед" />
+					<node name="spaceAfter" value="Пропуск після" />
+					<node name="startIndent" toBeTranslated="true" value="Line Start Indent" />
+					<node name="endIndent" toBeTranslated="true" value="Line End Indent" />
 				</node>
 				<node name="Styles" value="Стилі">
-					<node name="optionsFor" value="Налаштування для"/>
+					<node name="optionsFor" value="Налаштування для" />
 					<node name="fontFamily" value="Шрифт">
-						<node name="unchanged" value="&lt;не змінювати&gt;"/>
+						<node name="unchanged" value="&lt;не змінювати&gt;" />
 					</node>
-					<node name="fontSize" value="Розмір"/>
-					<node name="fontSizeDifference" value="Розмір"/>
-					<node name="bold" value="Жирний"/>
-					<node name="italic" value="Курсив"/>
-					<node name="allowHyphenations" value="Переноси"/>
-					<node name="autoHyphenations" value="Переноси"/>
+					<node name="fontSize" value="Розмір" />
+					<node name="fontSizeDifference" value="Розмір" />
+					<node name="bold" value="Жирний" />
+					<node name="italic" value="Курсив" />
+					<node name="allowHyphenations" value="Переноси" />
+					<node name="autoHyphenations" value="Переноси" />
 				</node>
 				<node name="Rotation" value="Поворот">
 					<node name="direction" value="Як повертати">
-						<node name="disabled" value="Не повертати взагалі"/>
-						<node name="clockwise" value="На 90 градусів за годинниковою стрілкою"/>
-						<node name="counterclockwise" value="На 90 градусів проти годинникової стрілки"/>
-						<node name="180" value="На 180 градусів"/>
-						<node name="cycle" value="Перемикатися поміж 4 орієнтаціями"/>
+						<node name="disabled" value="Не повертати взагалі" />
+						<node name="clockwise" value="На 90 градусів за годинниковою стрілкою" />
+						<node name="counterclockwise" value="На 90 градусів проти годинникової стрілки" />
+						<node name="180" value="На 180 градусів" />
+						<node name="cycle" value="Перемикатися поміж 4 орієнтаціями" />
 					</node>
 				</node>
 				<node name="Colors" value="Кольори">
 					<node name="colorFor" value="Колір">
-						<node name="background" value="фону"/>
-						<node name="selectionBackground" value="фону помітки"/>
-						<node name="text" value="звичайного тексту"/>
-						<node name="internalLink" value="посилання"/>
-						<node name="externalLink" value="зовнішнього посилання"/>
-						<node name="highlighted" value="підсвіченого тексту"/>
-						<node name="treeLines" value="ліній"/>
-						<node name="indicator" value="індикатора"/>
+						<node name="background" value="фону" />
+						<node name="selectionBackground" value="фону помітки" />
+						<node name="text" value="звичайного тексту" />
+						<node name="internalLink" value="посилання" />
+						<node name="externalLink" value="зовнішнього посилання" />
+						<node name="bookLink" toBeTranslated="true" value="Link to Another Book" />
+						<node name="highlighted" value="підсвіченого тексту" />
+						<node name="treeLines" value="ліній" />
+						<node name="indicator" value="індикатора" />
 					</node>
 				</node>
 				<node name="Keys" value="Клавіші">
-					<node name="grabSystemKeys" value="Перехоплювати системні клавиші"/>
-					<node name="separate" value="Свої налаштування для кожної орієнтації тексту"/>
-					<node name="orientation" value="Орієнтація"/>
+					<node name="grabSystemKeys" value="Перехоплювати системні клавиші" />
+					<node name="separate" value="Свої налаштування для кожної орієнтації тексту" />
+					<node name="orientation" value="Орієнтація" />
 					<node name="action">
-						<node name="none" value="Ніяких дій"/>
-						<node name="showLibrary" value="Показати бібліотеку"/>
-						<node name="showRecent" value="Показати прочитані книги"/>
-						<node name="previousBook" value="Відкрити попередню книгу"/>
-						<node name="toc" value="Показати зміст"/>
-						<node name="gotoHome" value="Перейти до початку тексту"/>
-						<node name="gotoSectionStart" value="Перейти до початку розділу"/>
-						<node name="gotoSectionEnd" value="Перейти до кінця розділу"/>
-						<node name="nextTOCSection" value="Перейти до наступної глави"/>
-						<node name="previousTOCSection" value="Перейти до попередньої глави"/>
-						<node name="largeScrollForward" value="Прокрутити вперед (на більшу відстань)"/>
-						<node name="largeScrollBackward" value="Прокрутити назад (на більшу відстань)"/>
-						<node name="smallScrollForward" value="Прокрутити вперед (на невелику відстань)"/>
-						<node name="smallScrollBackward" value="Прокрутити назад (на невелику відстань)"/>
-						<node name="undo" value="Скасувати перехід"/>
-						<node name="redo" value="Повторити перехід"/>
-						<node name="copyToClipboard" value="Скопіювати позначений текст до буфера"/>
-						<node name="openInDictionary" value="Відкрити позначений текст у словнику"/>
-						<node name="clearSelection" value="Зняти позначку"/>
-						<node name="search" value="Показати діалог пошуку"/>
-						<node name="findPrevious" value="Шукати назад"/>
-						<node name="findNext" value="Шукати вперед"/>
-						<node name="increaseFont" value="Збільшити розмір шрифта"/>
-						<node name="decreaseFont" value="Зменшити розмір шрифта"/>
-						<node name="toggleIndicator" value="Показати/сховати індикатор"/>
-						<node name="toggleFullscreen" value="Ввімкнути/вимкнути повноекранний режим"/>
-						<node name="onFullscreen" value="Ввімкнути повноекранний режим"/>
-						<node name="rotate" value="Повернути текст"/>
-						<node name="preferences" value="Показати діалог налаштувань"/>
-						<node name="bookInfo" value="Показати інформацію про книгу"/>
-						<node name="addBook" value="Додати файл до бібліотеки"/>
-						<node name="cancel" value="Відмінити поточний режим"/>
-						<node name="quit" value="Вийти з програми"/>
+						<node name="none" value="Ніяких дій" />
+						<node name="showLibrary" value="Показати бібліотеку" />
+						<node name="showNetLibrary" toBeTranslated="true" value="Show Network Library" />
+						<node name="showRecent" value="Показати прочитані книги" />
+						<node name="previousBook" value="Відкрити попередню книгу" />
+						<node name="toc" value="Показати зміст" />
+						<node name="gotoHome" value="Перейти до початку тексту" />
+						<node name="gotoSectionStart" value="Перейти до початку розділу" />
+						<node name="gotoSectionEnd" value="Перейти до кінця розділу" />
+						<node name="nextTOCSection" value="Перейти до наступної глави" />
+						<node name="previousTOCSection" value="Перейти до попередньої глави" />
+						<node name="largeScrollForward" value="Прокрутити вперед (на більшу відстань)" />
+						<node name="largeScrollBackward" value="Прокрутити назад (на більшу відстань)" />
+						<node name="smallScrollForward" value="Прокрутити вперед (на невелику відстань)" />
+						<node name="smallScrollBackward" value="Прокрутити назад (на невелику відстань)" />
+						<node name="undo" value="Скасувати перехід" />
+						<node name="redo" value="Повторити перехід" />
+						<node name="copyToClipboard" value="Скопіювати позначений текст до буфера" />
+						<node name="openInDictionary" value="Відкрити позначений текст у словнику" />
+						<node name="clearSelection" value="Зняти позначку" />
+						<node name="search" value="Показати діалог пошуку" />
+						<node name="findPrevious" value="Шукати назад" />
+						<node name="findNext" value="Шукати вперед" />
+						<node name="increaseFont" value="Збільшити розмір шрифта" />
+						<node name="decreaseFont" value="Зменшити розмір шрифта" />
+						<node name="toggleIndicator" value="Показати/сховати індикатор" />
+						<node name="toggleFullscreen" value="Ввімкнути/вимкнути повноекранний режим" />
+						<node name="rotate" value="Повернути текст" />
+						<node name="preferences" value="Показати діалог налаштувань" />
+						<node name="bookInfo" value="Показати інформацію про книгу" />
+						<node name="addBook" value="Додати файл до бібліотеки" />
+						<node name="cancel" value="Відмінити поточний режим" />
+						<node name="quit" value="Вийти з програми" />
 					</node>
-					<node name="quitOnCancel" value="Вийти з програми"/>
-					<node name="keyDelay" value="Затримка між натисканням на клавіші"/>
+					<node name="quitOnCancel" value="Вийти з програми" />
+					<node name="keyDelay" value="Затримка між натисканням на клавіші" />
 				</node>
 				<node name="Config" value="Налаштування">
-					<node name="autoSave" value="Автоматично зберігати стан"/>
-					<node name="timeout" value="Час між збереженням, секунди"/>
+					<node name="autoSave" value="Автоматично зберігати стан" />
+					<node name="timeout" value="Час між збереженням, секунди" />
 				</node>
 				<node name="Dictionary" value="Словники">
-					<node name="enableIntegration" value="Увімкнути інтеграцію з %s"/>
-					<node name="defaultText" value="Увімкнути інтеграцію зі словником"/>
-					<node name="choice" value="Використати"/>
-					<node name="singleClickOpen" value="Відкривати словник по натисканню на слово"/>
+					<node name="enableIntegration" value="Увімкнути інтеграцію з %s" />
+					<node name="defaultText" value="Увімкнути інтеграцію зі словником" />
+					<node name="choice" value="Використати" />
+					<node name="singleClickOpen" value="Відкривати словник по натисканню на слово" />
 				</node>
 				<node name="Web" value="Веб">
-					<node name="enableIntegration" value="Відкривати зовнішні посилання за допомогою %s"/>
-					<node name="defaultText" value="Відкривати зовнішні посилання у переглядачі"/>
-					<node name="choice" value="Переглядач"/>
-					<node name="command" value="Виконати команду"/>
+					<node name="enableIntegration" value="Відкривати зовнішні посилання за допомогою %s" />
+					<node name="defaultText" value="Відкривати зовнішні посилання у переглядачі" />
+					<node name="choice" value="Переглядач" />
+					<node name="command" value="Виконати команду" />
 				</node>
 				<node name="Maemo" value="Maemo">
-					<node name="keyActionOnRelease" value="Виконувати при вiдпусканнi клавiши, нe при натисненнi"/>
-					<node name="minStylusPressure" value="Мiнiмальне натискування стiлусом"/>
-					<node name="maxStylusPressure" value="Максимальне натискування стiлусом"/>
+					<node name="keyActionOnRelease" value="Виконувати при вiдпусканнi клавiши, нe при натисненнi" />
+					<node name="minStylusPressure" value="Мiнiмальне натискування стiлусом" />
+					<node name="maxStylusPressure" value="Максимальне натискування стiлусом" />
 				</node>
 			</node>
 		</node>
 		<node name="InfoDialog">
-			<node name="title" value="FBReader - Інформація про книгу"/>
+			<node name="title" value="FBReader - Інформація про книгу" />
 			<node name="tab">
 				<node name="Common" value="Основна інформація">
-					<node name="file" value="Файл"/>
-					<node name="title" value="Назва"/>
-					<node name="authorDisplayName" value="Ім'я автора"/>
-					<node name="authorSortKey" value="Ім'я для сортування"/>
-					<node name="language" value="Мова"/>
-					<node name="encodingSet" value="Набір кодувань"/>
-					<node name="encoding" value="Кодування"/>
+					<node name="file" value="Файл" />
+					<node name="title" value="Назва" />
+					<node name="authorDisplayName" value="Ім&apos;я автора" />
+					<node name="authorSortKey" value="Ім&apos;я для сортування" />
+					<node name="language" value="Мова" />
+					<node name="encodingSet" value="Набір кодувань" />
+					<node name="encoding" value="Кодування" />
 				</node>
 				<node name="Series" value="Серія">
-					<node name="seriesTitle" value="Назва серії"/>
-					<node name="bookNumber" value="Номер книги у серії"/>
+					<node name="seriesTitle" value="Назва серії" />
+					<node name="bookNumber" value="Номер книги у серії" />
 				</node>
-				<node name="Tags" value="Tags" toBeTranslated="true">
-					<node name="tags" value="Tag List" toBeTranslated="true"/>
+				<node name="Tags" toBeTranslated="true" value="Tags">
+					<node name="tags" toBeTranslated="true" value="Tag List" />
 				</node>
 				<node name="Text" value="Текст">
-					<node name="breakType" value="Новий параграф по"/>
-					<node name="ignoreIndent" value="Ігнорувати відступи менше"/>
-					<node name="buildTOC" value="Побудувати зміст"/>
-					<node name="emptyLines" value="Порожніх рядків між главами"/>
+					<node name="breakType" value="Новий параграф по" />
+					<node name="ignoreIndent" value="Ігнорувати відступи менше" />
+					<node name="buildTOC" value="Побудувати зміст" />
+					<node name="emptyLines" value="Порожніх рядків між главами" />
 				</node>
 				<node name="&lt;PRE&gt;" value="&lt;PRE&gt;">
-					<node name="breakType" value="Новий параграф по"/>
-					<node name="ignoreIndent" value="Ігнорувати відступи менше"/>
-					<node name="buildTOC" value="Побудувати зміст"/>
-					<node name="emptyLines" value="Порожніх рядків між главами"/>
+					<node name="breakType" value="Новий параграф по" />
+					<node name="ignoreIndent" value="Ігнорувати відступи менше" />
+					<node name="buildTOC" value="Побудувати зміст" />
+					<node name="emptyLines" value="Порожніх рядків між главами" />
 				</node>
 			</node>
 		</node>
 		<node name="addFileDialog">
-			<node name="title" value="FBReader - Додавання книги до бібліотеки"/>
+			<node name="title" value="FBReader - Додавання книги до бібліотеки" />
 		</node>
 		<node name="textSearchDialog">
-			<node name="title" value="Пошук по тексту"/>
-			<node name="text" value=""/>
-			<node name="ignoreCase" value="Ігнорувати регістр букв"/>
-			<node name="wholeText" value="По всьому тексту"/>
-			<node name="backward" value="Назад"/>
-			<node name="currentSection" value="Тільки у цьому розділі"/>
+			<node name="title" value="Пошук по тексту" />
+			<node name="text" value="" />
+			<node name="ignoreCase" value="Ігнорувати регістр букв" />
+			<node name="wholeText" value="По всьому тексту" />
+			<node name="backward" value="Назад" />
+			<node name="currentSection" value="Тільки у цьому розділі" />
+		</node>
+		<node name="networkSearchDialog">
+			<node name="title" toBeTranslated="true" value="Network Search" />
+			<node name="bookTitle" toBeTranslated="true" value="Title" />
+			<node name="author" toBeTranslated="true" value="Author" />
+			<node name="category" toBeTranslated="true" value="Category" />
+			<node name="series" toBeTranslated="true" value="Series" />
+			<node name="description" toBeTranslated="true" value="Description" />
 		</node>
 		<node name="gotoPageDialog">
-			<node name="title" value="Go To Page" toBeTranslated="true"/>
-			<node name="pageNumber" value="Go to Page Number" toBeTranslated="true"/>
+			<node name="title" toBeTranslated="true" value="Go To Page" />
+			<node name="pageNumber" toBeTranslated="true" value="Go to Page Number" />
 		</node>
 		<node name="editTagInfoDialog">
-			<node name="title" value="Edit/Clone Tag" toBeTranslated="true"/>
-			<node name="editOrClone" value="Action" toBeTranslated="true">
-				<node name="edit" value="Rename Tag" toBeTranslated="true"/>
-				<node name="clone" value="Clone Tag" toBeTranslated="true"/>
+			<node name="title" toBeTranslated="true" value="Edit/Clone Tag" />
+			<node name="editOrClone" toBeTranslated="true" value="Action">
+				<node name="edit" toBeTranslated="true" value="Rename Tag" />
+				<node name="clone" toBeTranslated="true" value="Clone Tag" />
 			</node>
-			<node name="name" value="Tag Name" toBeTranslated="true"/>
-			<node name="includeSubtags" value="Include Subtags" toBeTranslated="true"/>
+			<node name="name" toBeTranslated="true" value="Tag Name" />
+			<node name="includeSubtags" toBeTranslated="true" value="Include Subtags" />
 		</node>
 		<node name="removeBookBox">
-			<node name="title" value="Видалення книги"/>
-			<node name="message" value="Видалити книгу &#10;&quot;%s&quot;&#10; з бібліотеки?"/>
+			<node name="title" value="Видалення книги" />
+			<node name="message" value="Видалити книгу&#10;&quot;%s&quot;&#10;з бібліотеки?" />
 		</node>
 		<node name="removeTagBox">
-			<node name="title" value="Remove Tag" toBeTranslated="true"/>
-			<node name="message" value="Remove Tag &#8220;%s&#8221;?" toBeTranslated="true"/>
+			<node name="title" toBeTranslated="true" value="Remove Tag" />
+			<node name="message" toBeTranslated="true" value="Remove Tag “%s”?" />
 		</node>
 		<node name="openBookErrorBox">
-			<node name="title" value="Помилка"/>
-			<node name="message" value="Не можу відкрити:&#10;%s"/>
+			<node name="title" value="Помилка" />
+			<node name="message" value="Не можу відкрити:&#10;%s" />
 		</node>
 		<node name="noHelpBox">
-			<node name="title" value="Помилка"/>
-			<node name="message" value="Вибачте, немає файлу з інформацією"/>
+			<node name="title" value="Помилка" />
+			<node name="message" value="Вибачте, немає файлу з інформацією" />
 		</node>
 		<node name="tagMustBeNonEmpty">
-			<node name="title" value="Помилка"/>
-			<node name="message" value="Tag name must be a non-empty string" toBeTranslated="true"/>
+			<node name="title" value="Помилка" />
+			<node name="message" toBeTranslated="true" value="Tag name must be a non-empty string" />
 		</node>
 		<node name="tagMustNotContainComma">
-			<node name="title" value="Помилка"/>
-			<node name="message" value="Tag name must not contain a &#8220;,&#8221; symbol" toBeTranslated="true"/>
+			<node name="title" value="Помилка" />
+			<node name="message" toBeTranslated="true" value="Tag name must not contain a “,” symbol" />
+		</node>
+		<node name="networkError">
+			<node name="emptyLibrariesList" toBeTranslated="true" value="Empty libraries list" />
+		</node>
+		<node name="downloadError">
+			<node name="title" toBeTranslated="true" value="Error while downloading" />
+			<node name="message" toBeTranslated="true" value="Can&apos;t download this book at the moment" />
 		</node>
 		<node name="waitMessage">
-			<node name="loadingBook" value="Завантаження книги. Зачекайте..."/>
-			<node name="loadingBookList" value="Завантаження списку книг. Зачекайте..."/>
-			<node name="migrate" value="Upgrading to the new version. Please, wait..." toBeTranslated="true"/>
+			<node name="loadingBook" value="Завантаження книги. Зачекайте..." />
+			<node name="loadingBookList" value="Завантаження списку книг. Зачекайте..." />
+			<node name="migrate" toBeTranslated="true" value="Upgrading to the new version. Please, wait..." />
+			<node name="downloadBookList" toBeTranslated="true" value="Downloading book list. Please, wait..." />
+			<node name="downloadBook" toBeTranslated="true" value="Downloading book. Please, wait..." />
 		</node>
 	</node>
 	<node name="style">
-		<node name="Base" value="тексту типово"/>
-		<node name="Regular Paragraph" value="звичайного тексту"/>
-		<node name="Title" value="заголовку"/>
-		<node name="Section Title" value="назви розділу"/>
-		<node name="Poem Title" value="назви вірша"/>
-		<node name="Subtitle" value="підзаголовку"/>
-		<node name="Annotation" value="анотації"/>
-		<node name="Epigraph" value="епіграфу"/>
-		<node name="Stanza" value="строфи"/>
-		<node name="Verse" value="віршів"/>
-		<node name="Preformatted text" value="тексту всередині &lt;pre&gt;"/>
-		<node name="Image" value="малюнку"/>
-		<node name="Cite" value="цитати"/>
-		<node name="Author" value="імені автора"/>
-		<node name="Date" value="дати"/>
-		<node name="Internal Hyperlink" value="посилання"/>
-		<node name="Footnote" value="зноски"/>
-		<node name="Emphasis" value="виділення (emphasis)"/>
-		<node name="Strong" value="виділення (strong)"/>
-		<node name="Subscript" value="нижнього індексу"/>
-		<node name="Superscript" value="верхнього індексу"/>
-		<node name="Code" value="тексту програми"/>
-		<node name="StrikeThrough" value="закресленого тексту"/>
-		<node name="Contents Table" value="змісту"/>
-		<node name="Author in Library" value="імені автора у бібліотеці"/>
-		<node name="Book in Library" value="бібліотеки"/>
-		<node name="Recent Book List" value="списку книг"/>
-		<node name="Italic" value="курсиву"/>
-		<node name="Bold" value="жирного тексту"/>
-		<node name="Definition" value="визначення"/>
-		<node name="Definition Description" value="тексту визначення"/>
-		<node name="Header 1" value="тексту всередині &lt;h1&gt;"/>
-		<node name="Header 2" value="тексту всередині &lt;h2&gt;"/>
-		<node name="Header 3" value="тексту всередині &lt;h3&gt;"/>
-		<node name="Header 4" value="тексту всередині &lt;h4&gt;"/>
-		<node name="Header 5" value="тексту всередині &lt;h5&gt;"/>
-		<node name="Header 6" value="тексту всередині &lt;h6&gt;"/>
-		<node name="External Hyperlink" value="зовнішнього посилання"/>
+		<node name="Base" value="тексту типово" />
+		<node name="Regular Paragraph" value="звичайного тексту" />
+		<node name="Title" value="заголовку" />
+		<node name="Section Title" value="назви розділу" />
+		<node name="Poem Title" value="назви вірша" />
+		<node name="Subtitle" value="підзаголовку" />
+		<node name="Annotation" value="анотації" />
+		<node name="Epigraph" value="епіграфу" />
+		<node name="Stanza" value="строфи" />
+		<node name="Verse" value="віршів" />
+		<node name="Preformatted text" value="тексту всередині &lt;pre&gt;" />
+		<node name="Image" value="малюнку" />
+		<node name="Cite" value="цитати" />
+		<node name="Author" value="імені автора" />
+		<node name="Date" value="дати" />
+		<node name="Internal Hyperlink" value="посилання" />
+		<node name="Footnote" value="зноски" />
+		<node name="Emphasis" value="виділення (emphasis)" />
+		<node name="Strong" value="виділення (strong)" />
+		<node name="Subscript" value="нижнього індексу" />
+		<node name="Superscript" value="верхнього індексу" />
+		<node name="Code" value="тексту програми" />
+		<node name="StrikeThrough" value="закресленого тексту" />
+		<node name="Contents Table" value="змісту" />
+		<node name="Library Entry" toBeTranslated="true" value="Library Entry" />
+		<node name="Recent Book List" value="списку книг" />
+		<node name="Italic" value="курсиву" />
+		<node name="Bold" value="жирного тексту" />
+		<node name="Definition" value="визначення" />
+		<node name="Definition Description" value="тексту визначення" />
+		<node name="Header 1" value="тексту всередині &lt;h1&gt;" />
+		<node name="Header 2" value="тексту всередині &lt;h2&gt;" />
+		<node name="Header 3" value="тексту всередині &lt;h3&gt;" />
+		<node name="Header 4" value="тексту всередині &lt;h4&gt;" />
+		<node name="Header 5" value="тексту всередині &lt;h5&gt;" />
+		<node name="Header 6" value="тексту всередині &lt;h6&gt;" />
+		<node name="External Hyperlink" value="зовнішнього посилання" />
+		<node name="Link to Another Book" toBeTranslated="true" value="Link to Another Book" />
 	</node>
 	<node name="external">
-		<node name="browser" value="переглядачі"/>
-		<node name="defaultBrowser" value="переглядачі"/>
+		<node name="browser" value="переглядачі" />
+		<node name="defaultBrowser" value="переглядачі" />
 	</node>
 	<node name="mobipocketPlugin">
-		<node name="unknown" value="невідома помилка"/>
-		<node name="unsupportedCompressionMethod" value="метод натискання, що не підтримується"/>
-		<node name="encriptedFile" value="файл захищений DRM"/>
+		<node name="unknown" value="невідома помилка" />
+		<node name="unsupportedCompressionMethod" value="метод натискання, що не підтримується" />
+		<node name="encriptedFile" value="файл захищений DRM" />
+	</node>
+	<node name="networkLibrary">
+		<node name="caption" toBeTranslated="true" value="Network Library" />
+		<node name="startText" toBeTranslated="true" value="Please enter a search pattern in the text field on the toolbar and press &lt;Return&gt;." />
+		<node name="notFound" toBeTranslated="true" value="Sorry, no suitable books were found." />
 	</node>
 	<node name="library">
-		<node name="caption" value="Бібліотека"/>
-		<node name="allBooks" value="All Books" toBeTranslated="true"/>
-		<node name="booksWithoutTags" value="Books with no Tags" toBeTranslated="true"/>
-		<node name="noBooks" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (&#8220;Library&#8221; tab, &#8220;Book Path&#8221; entry). Alternatively, you can add books to your library using &#8220;Add Book&#8221; button." toBeTranslated="true"/>
+		<node name="caption" value="Бібліотека" />
+		<node name="allBooks" toBeTranslated="true" value="All Books" />
+		<node name="booksWithoutTags" toBeTranslated="true" value="Books with no Tags" />
+		<node name="noBooks" toBeTranslated="true" value="FBReader found no books in the configured locations. Please specify the path to your books in the Preferences Dialog (“Library” tab, “Book Path” entry). Alternatively, you can add books to your library using “Add Book” button." />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/desktop/desktop /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/desktop/desktop
--- fbreader-0.8.17/fbreader/desktop/desktop	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/desktop/desktop	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=E-book reader
 Name[ru]=Чтение электронных книг
 GenericName=E-book reader
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/Makefile /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/Makefile
--- fbreader-0.8.17/fbreader/Makefile	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/Makefile	2009-04-30 22:26:45.000000000 +0100
@@ -7,10 +7,10 @@
 TARGET = FBReader
 target = fbreader
 
-ALL_SUBDIRS = src src/migration src/options src/description src/collection src/bookmodel src/formats src/formats/fb2 src/formats/docbook src/formats/html src/formats/pdb src/formats/txt src/formats/tcr src/formats/chm src/formats/xhtml src/formats/oeb src/formats/rtf src/formats/openreader src/formats/dummy src/formats/util src/external src/optionsDialog src/fbreader src/encodingOption
+ALL_SUBDIRS = src src/migration src/constants src/options src/description src/collection src/bookmodel src/formats src/formats/fb2 src/formats/docbook src/formats/css src/formats/html src/formats/pdb src/formats/txt src/formats/tcr src/formats/chm src/formats/xhtml src/formats/oeb src/formats/rtf src/formats/openreader src/formats/pdf src/formats/dummy src/formats/util src/external src/optionsDialog src/fbreader src/encodingOption src/network src/network/feedbooks src/network/fbreaderOrg
 ALL_ARCHSUBDIRS = desktop pdaxrom opie zaurus maemo openzaurus pma400 win32
 
-SUBDIRS = src/migration src/options src/description src/collection src/bookmodel src/formats src/formats/fb2 src/formats/html src/formats/pdb src/formats/txt src/formats/tcr src/formats/chm src/formats/xhtml src/formats/oeb src/formats/rtf src/formats/openreader src/formats/util src/external src/optionsDialog src/fbreader src/encodingOption
+SUBDIRS = src/migration src/constants src/options src/description src/collection src/bookmodel src/formats src/formats/fb2 src/formats/css src/formats/html src/formats/pdb src/formats/txt src/formats/tcr src/formats/chm src/formats/xhtml src/formats/oeb src/formats/rtf src/formats/openreader src/formats/util src/external src/optionsDialog src/fbreader src/encodingOption src/network src/network/feedbooks src/network/fbreaderOrg
 
 all: .resources
 	@for subdir in $(SUBDIRS); do \
@@ -18,9 +18,9 @@
 			exit 1; \
 		fi; \
 	done;
-	@echo -n "Linking $(TARGET) ..."
+	@echo -n 'Linking $(TARGET) ...'
 	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` -L$(ROOTDIR)/zlibrary/text $(TEXT_LIBS) $(CORE_LIBS)
-	@echo " OK"
+	@echo ' OK'
 
 FBSHAREDIR = $(DESTDIR)$(subst %APPLICATION_PATH%\\\\,/,$(SHAREDIR))/FBReader
 VARIANT = $(TARGET_ARCH)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/moto/util/language_detector.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/moto/util/language_detector.cpp
--- fbreader-0.8.17/fbreader/moto/util/language_detector.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/moto/util/language_detector.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
 #include <iostream>
 #include <string>
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/pepperpad3/desktop /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/pepperpad3/desktop
--- fbreader-0.8.17/fbreader/pepperpad3/desktop	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/pepperpad3/desktop	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=E-book reader
 Name[ru]=Чтение электронных книг
 GenericName=E-book reader
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/scripts/install_help.sh /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/scripts/install_help.sh
--- fbreader-0.8.17/fbreader/scripts/install_help.sh	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/scripts/install_help.sh	2009-04-30 22:26:45.000000000 +0100
@@ -6,16 +6,16 @@
 fi;
 
 case "$1" in
-	desktop|maemo|openzaurus_640x480|pdaxrom|pepperpad3|zaurus_640x480)
+	desktop|openzaurus_640x480|pdaxrom|pepperpad3|zaurus_640x480)
 		platform=desktop;
 		;;
-	moto)
-		platform=desktop;
+	maemo)
+		platform=maemo;
 		;;
 	opensimpad-0.9.0|qvfb)
 		platform=640x480;
 		;;
-	openzaurus_240x320|pma400|zaurus_240x320)
+	openzaurus_240x320|pma400|zaurus_240x320|moto)
 		platform=240x320;
 		;;
 	win32)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/scripts/install_toolbar_and_menu.sh /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/scripts/install_toolbar_and_menu.sh
--- fbreader-0.8.17/fbreader/scripts/install_toolbar_and_menu.sh	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/scripts/install_toolbar_and_menu.sh	2009-04-30 22:26:45.000000000 +0100
@@ -6,7 +6,14 @@
 fi;
 
 case "$1" in
-	desktop|win32|pepperpad3)
+	desktop|win32)
+		toolbar_file=data/default/toolbar.desktop.xml
+		fullscreen_toolbar_file=data/default/fullscreen_toolbar.desktop.xml
+		;;
+	maemo)
+		toolbar_file=data/default/toolbar.maemo.xml
+		;;
+	pepperpad3)
 		toolbar_file=data/default/toolbar.full.xml
 		;;
 	zaurus_640x480)
@@ -32,6 +39,10 @@
 	install -m 0644 $toolbar_file $2/toolbar.xml;
 fi;
 
+if [ "$fullscreen_toolbar_file" != "" ]; then
+	install -m 0644 $fullscreen_toolbar_file $2/fullscreen_toolbar.xml;
+fi;
+
 if [ "$menubar_file" != "" ]; then
 	install -m 0644 $menubar_file $2/menubar.xml;
 fi;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/bookmodel/BookModel.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookModel.cpp
--- fbreader-0.8.17/fbreader/src/bookmodel/BookModel.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookModel.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/bookmodel/BookModel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookModel.h
--- fbreader-0.8.17/fbreader/src/bookmodel/BookModel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookModel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 
 #include <ZLTextModel.h>
 #include <ZLTextParagraph.h>
+#include <ZLUserData.h>
 #include "../description/BookDescription.h"
 
 class ZLImage;
@@ -39,7 +40,7 @@
 	std::map<const ZLTextTreeParagraph*,int> myReferenceByParagraph;
 };
 
-class BookModel {
+class BookModel : public ZLUserDataHolder {
 
 public:
 	struct Label {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/bookmodel/BookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookReader.cpp
--- fbreader-0.8.17/fbreader/src/bookmodel/BookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +77,7 @@
 			myCurrentTextModel->addControl(*it, true);
 		}
 		if (!myHyperlinkReference.empty()) {
-			myCurrentTextModel->addHyperlinkControl(myHyperlinkKind, myHyperlinkReference);
+			myCurrentTextModel->addHyperlinkControl(myHyperlinkKind, myHyperlinkReference, myHyperlinkType);
 		}
 		myTextParagraphExists = true;
 	}
@@ -106,7 +106,7 @@
 	}
 }
 
-void BookReader::addControl(const ZLTextForcedControlEntry &entry) {
+void BookReader::addControl(const ZLTextStyleEntry &entry) {
 	if (myTextParagraphExists) {
 		flushTextBufferToParagraph();
 		myCurrentTextModel->addControl(entry);
@@ -114,11 +114,26 @@
 }
 
 void BookReader::addHyperlinkControl(FBTextKind kind, const std::string &label) {
+	myHyperlinkKind = kind;
+	switch (myHyperlinkKind) {
+		case INTERNAL_HYPERLINK:
+		case FOOTNOTE:
+			myHyperlinkType = "internal";
+			break;
+		case EXTERNAL_HYPERLINK:
+			myHyperlinkType = "external";
+			break;
+		case BOOK_HYPERLINK:
+			myHyperlinkType = "book";
+			break;
+		default:
+			myHyperlinkType.erase();
+			break;
+	}
 	if (myTextParagraphExists) {
 		flushTextBufferToParagraph();
-		myCurrentTextModel->addHyperlinkControl(kind, label);
+		myCurrentTextModel->addHyperlinkControl(kind, label, myHyperlinkType);
 	}
-	myHyperlinkKind = kind;
 	myHyperlinkReference = label;
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/bookmodel/BookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookReader.h
--- fbreader-0.8.17/fbreader/src/bookmodel/BookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/bookmodel/BookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
 	void endParagraph();
 	bool paragraphIsOpen() const;
 	void addControl(FBTextKind kind, bool start);
-	void addControl(const ZLTextForcedControlEntry &entry);
+	void addControl(const ZLTextStyleEntry &entry);
 	void addHyperlinkControl(FBTextKind kind, const std::string &label);
 	void addHyperlinkLabel(const std::string &label);
 	void addHyperlinkLabel(const std::string &label, int paragraphNumber);
@@ -99,6 +99,7 @@
 	std::vector<std::string> myContentsBuffer;
 
 	std::string myHyperlinkReference;
+	std::string myHyperlinkType;
 	FBTextKind myHyperlinkKind;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/bookmodel/FBTextKind.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/bookmodel/FBTextKind.h
--- fbreader-0.8.17/fbreader/src/bookmodel/FBTextKind.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/bookmodel/FBTextKind.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,9 +49,10 @@
 	CODE = 21,
 	STRIKETHROUGH = 22,
 	CONTENTS_TABLE_ENTRY = 23,
-	LIBRARY_AUTHOR_ENTRY = 24,
-	LIBRARY_BOOK_ENTRY = 25,
-	RECENT_BOOK_LIST = 26,
+	//LIBRARY_AUTHOR_ENTRY = 24,
+	//LIBRARY_BOOK_ENTRY = 25,
+	LIBRARY_ENTRY = 25,
+	//RECENT_BOOK_LIST = 26,
 	ITALIC = 27,
 	BOLD = 28,
 	DEFINITION = 29,
@@ -63,6 +64,7 @@
 	H5 = 35,
 	H6 = 36,
 	EXTERNAL_HYPERLINK = 37,
+	BOOK_HYPERLINK = 38,
 };
 
 #endif /* __FBTEXTKIND_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/collection/BookCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/collection/BookCollection.cpp
--- fbreader-0.8.17/fbreader/src/collection/BookCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/collection/BookCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,15 +41,14 @@
 bool DescriptionComparator::operator() (const BookDescriptionPtr d1, const BookDescriptionPtr d2) {
 	AuthorPtr author1 = d1->author();
 	AuthorPtr author2 = d2->author();
-	const std::string sortKey1 = author1->sortKey();
-	const std::string sortKey2 = author2->sortKey();
-	if (sortKey1 != sortKey2) {
-		return sortKey1 < sortKey2;
-	}
-	const std::string displayName1 = author1->displayName();
-	const std::string displayName2 = author2->displayName();
-	if (displayName1 != displayName2) {
-		return displayName1 < displayName2;
+
+	int comp = author1->sortKey().compare(author2->sortKey());
+	if (comp != 0) {
+		return comp < 0;
+	}
+	comp = author1->displayName().compare(author2->displayName());
+	if (comp != 0) {
+		return comp < 0;
 	}
 
 	const std::string &seriesName1 = d1->seriesName();
@@ -74,6 +73,7 @@
 BookCollection::BookCollection() :
 	PathOption(ZLCategoryKey::CONFIG, OPTIONS, "BookPath", ""),
 	ScanSubdirsOption(ZLCategoryKey::CONFIG, OPTIONS, "ScanSubdirs", false),
+	CollectAllBooksOption(ZLCategoryKey::CONFIG, OPTIONS, "CollectAllBooks", false),
 	myDoStrongRebuild(true),
 	myDoWeakRebuild(false) {
 }
@@ -96,12 +96,13 @@
 		if (dir.isNull()) {
 			continue;
 		}
-		dir->collectFiles(files, false);
+		dir->collectFiles(files, true);
 		if (!files.empty()) {
+			const bool collectBookWithoutMetaInfo = CollectAllBooksOption.value();
 			for (std::vector<std::string>::const_iterator jt = files.begin(); jt != files.end(); ++jt) {
 				const std::string fileName = dir->itemPath(*jt);
 				ZLFile file(fileName);
-				if (PluginCollection::instance().plugin(file, true) != 0) {
+				if (PluginCollection::instance().plugin(file, !collectBookWithoutMetaInfo) != 0) {
 					bookFileNames.insert(fileName);
 				// TODO: zip -> any archive
 				} else if (file.extension() == "zip") {
@@ -112,7 +113,9 @@
 					std::vector<std::string> zipEntries;
 					BookDescriptionUtil::listZipEntries(file, zipEntries);
 					for (std::vector<std::string>::const_iterator zit = zipEntries.begin(); zit != zipEntries.end(); ++zit) {
-						bookFileNames.insert(*zit);
+						if (PluginCollection::instance().plugin(ZLFile(*zit), !collectBookWithoutMetaInfo) != 0) {
+							bookFileNames.insert(*zit);
+						}
 					}
 				}
 			}
@@ -195,18 +198,20 @@
 	while (!nameQueue.empty()) {
 		std::string name = nameQueue.front();
 		nameQueue.pop();
-		if (nameSet.find(name) == nameSet.end()) {
+		ZLFile f(name);
+		const std::string resolvedName = f.resolvedPath();
+		if (nameSet.find(resolvedName) == nameSet.end()) {
 			if (myScanSubdirs) {
-				shared_ptr<ZLDir> dir = ZLFile(name).directory();
+				shared_ptr<ZLDir> dir = f.directory();
 				if (!dir.isNull()) {
 					std::vector<std::string> subdirs;
-					dir->collectSubDirs(subdirs, false);
+					dir->collectSubDirs(subdirs, true);
 					for (std::vector<std::string>::const_iterator it = subdirs.begin(); it != subdirs.end(); ++it) {
 						nameQueue.push(dir->itemPath(*it));
 					}
 				}
 			}
-			nameSet.insert(name);
+			nameSet.insert(resolvedName);
 		}
 	}
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/collection/BookCollection.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/collection/BookCollection.h
--- fbreader-0.8.17/fbreader/src/collection/BookCollection.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/collection/BookCollection.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
 public:
 	ZLStringOption PathOption;
 	ZLBooleanOption ScanSubdirsOption;
+	ZLBooleanOption CollectAllBooksOption;
 
 public:
 	BookCollection();
@@ -74,15 +75,15 @@
 	mutable bool myDoWeakRebuild;
 };
 
-class LastOpenedBooks {
+class RecentBooks {
 
 public:
-	ZLIntegerRangeOption MaxListSizeOption;
+	static const size_t MaxListSize;
 
 public:
-	LastOpenedBooks();
-	~LastOpenedBooks();
-	void addBook(const std::string &fileName);
+	RecentBooks();
+	~RecentBooks();
+	void addBook(BookDescriptionPtr description);
 	const Books &books() const;
 
 private:
@@ -99,6 +100,6 @@
 	return myExternalBooks.find(description) != myExternalBooks.end();
 }
 
-inline const Books &LastOpenedBooks::books() const { return myBooks; }
+inline const Books &RecentBooks::books() const { return myBooks; }
 
 #endif /* __BOOKCOLLECTION_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/collection/BookList.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/collection/BookList.cpp
--- fbreader-0.8.17/fbreader/src/collection/BookList.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/collection/BookList.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/collection/BookList.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/collection/BookList.h
--- fbreader-0.8.17/fbreader/src/collection/BookList.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/collection/BookList.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/collection/LastOpenedBooks.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/collection/LastOpenedBooks.cpp
--- fbreader-0.8.17/fbreader/src/collection/LastOpenedBooks.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/collection/LastOpenedBooks.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <algorithm>
-
-#include <ZLStringUtil.h>
-#include <ZLOptions.h>
-
-#include "BookCollection.h"
-
-const std::string GROUP = "LastOpenedBooks";
-const std::string BOOK = "Book";
-
-LastOpenedBooks::LastOpenedBooks() :
-	MaxListSizeOption(ZLCategoryKey::STATE, GROUP, "MaxSize", 1, 100, 10) {
-
-	const int size = MaxListSizeOption.value();
-	for (int i = 0; i < size; ++i) {
-		std::string num = BOOK;
-		ZLStringUtil::appendNumber(num, i);
-		std::string name = ZLStringOption(ZLCategoryKey::STATE, GROUP, num, "").value();
-		if (!name.empty()) {
-			BookDescriptionPtr description = BookDescription::getDescription(name);
-			if (!description.isNull()) {
-				myBooks.push_back(description);
-			}
-		}
-	}
-}
-
-LastOpenedBooks::~LastOpenedBooks() {
-	const int size = std::min(MaxListSizeOption.value(), (long)myBooks.size());
-	for (int i = 0; i < size; ++i) {
-		std::string num = BOOK;
-		ZLStringUtil::appendNumber(num, i);
-		ZLStringOption(ZLCategoryKey::STATE, GROUP, num, "").setValue(myBooks[i]->fileName());
-	}
-}
-
-void LastOpenedBooks::addBook(const std::string &fileName) {
-	for (Books::iterator it = myBooks.begin(); it != myBooks.end(); ++it) {
-		if ((*it)->fileName() == fileName) {
-			myBooks.erase(it);
-			break;
-		}
-	}
-	BookDescriptionPtr description = BookDescription::getDescription(fileName);
-	if (!description.isNull()) {
-		myBooks.insert(myBooks.begin(), description);
-	}
-	const size_t maxSize = MaxListSizeOption.value();
-	if (myBooks.size() > maxSize) {
-		myBooks.erase(myBooks.begin() + maxSize, myBooks.end());
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/collection/RecentBooks.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/collection/RecentBooks.cpp
--- fbreader-0.8.17/fbreader/src/collection/RecentBooks.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/collection/RecentBooks.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <algorithm>
+
+#include <ZLStringUtil.h>
+#include <ZLOptions.h>
+
+#include "BookCollection.h"
+
+const std::string GROUP = "LastOpenedBooks";
+const std::string BOOK = "Book";
+
+const size_t RecentBooks::MaxListSize = 10;
+
+RecentBooks::RecentBooks() {
+	for (size_t i = 0; i < MaxListSize; ++i) {
+		std::string num = BOOK;
+		ZLStringUtil::appendNumber(num, i);
+		std::string name = ZLStringOption(ZLCategoryKey::STATE, GROUP, num, "").value();
+		if (!name.empty()) {
+			BookDescriptionPtr description = BookDescription::getDescription(name, false);
+			if (!description.isNull()) {
+				myBooks.push_back(description);
+			}
+		}
+	}
+}
+
+RecentBooks::~RecentBooks() {
+	const size_t size = std::min(MaxListSize, myBooks.size());
+	for (size_t i = 0; i < size; ++i) {
+		std::string num = BOOK;
+		ZLStringUtil::appendNumber(num, i);
+		ZLStringOption(ZLCategoryKey::STATE, GROUP, num, "").setValue(myBooks[i]->fileName());
+	}
+}
+
+void RecentBooks::addBook(BookDescriptionPtr description) {
+	if (description.isNull()) {
+		return;
+	}
+	for (Books::iterator it = myBooks.begin(); it != myBooks.end(); ++it) {
+		if ((*it)->fileName() == description->fileName()) {
+			myBooks.erase(it);
+			break;
+		}
+	}
+	myBooks.insert(myBooks.begin(), description);
+	if (myBooks.size() > MaxListSize) {
+		myBooks.erase(myBooks.begin() + MaxListSize, myBooks.end());
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/constants/XMLNamespace.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/constants/XMLNamespace.cpp
--- fbreader-0.8.17/fbreader/src/constants/XMLNamespace.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/constants/XMLNamespace.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "XMLNamespace.h"
+
+const std::string XMLNamespace::DublinCorePrefix = "http://purl.org/dc/elements";
+const std::string XMLNamespace::DublinCoreLegacyPrefix = "http://purl.org/metadata/dublin_core";
+const std::string XMLNamespace::XLink = "http://www.w3.org/1999/xlink";
+const std::string XMLNamespace::OpenPackagingFormat = "http://www.idpf.org/2007/opf";
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/constants/XMLNamespace.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/constants/XMLNamespace.h
--- fbreader-0.8.17/fbreader/src/constants/XMLNamespace.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/constants/XMLNamespace.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __XMLNAMESPACE_H__
+#define __XMLNAMESPACE_H__
+
+#include <string>
+
+class XMLNamespace {
+
+private:
+	XMLNamespace();
+
+public:
+	static const std::string DublinCorePrefix;
+	static const std::string DublinCoreLegacyPrefix;
+	static const std::string XLink;
+	static const std::string OpenPackagingFormat;
+};
+
+#endif /* __XMLNAMESPACE_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/description/Author.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/description/Author.cpp
--- fbreader-0.8.17/fbreader/src/description/Author.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/description/Author.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/description/Author.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/description/Author.h
--- fbreader-0.8.17/fbreader/src/description/Author.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/description/Author.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/description/BookDescription.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/description/BookDescription.cpp
--- fbreader-0.8.17/fbreader/src/description/BookDescription.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/description/BookDescription.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
 	TitleOption(FBCategoryKey::BOOKS, fileName, "Title", EMPTY),
 	SeriesNameOption(FBCategoryKey::BOOKS, fileName, "Sequence", EMPTY),
 	NumberInSeriesOption(FBCategoryKey::BOOKS, fileName, "Number in seq", 0, 100, 0),
-	LanguageOption(FBCategoryKey::BOOKS, fileName, "Language", PluginCollection::instance().DefaultLanguageOption.value()),
+	LanguageOption(FBCategoryKey::BOOKS, fileName, "Language", EMPTY),
 	EncodingOption(FBCategoryKey::BOOKS, fileName, "Encoding", EMPTY),
 	TagsOption(FBCategoryKey::BOOKS, fileName, "TagList", EMPTY) {
 }
@@ -53,7 +53,7 @@
 	TitleOption.setValue(EMPTY);
 	SeriesNameOption.setValue(EMPTY);
 	NumberInSeriesOption.setValue(0);
-	LanguageOption.setValue(PluginCollection::instance().DefaultLanguageOption.value());
+	LanguageOption.setValue(EMPTY);
 	EncodingOption.setValue(EMPTY);
 	TagsOption.setValue(EMPTY);
 }
@@ -81,7 +81,10 @@
 
 	if (!checkFile || BookDescriptionUtil::checkInfo(file)) {
 		BookInfo info(fileName);
-		description->myAuthor = SingleAuthor::create(info.AuthorDisplayNameOption.value(), info.AuthorSortKeyOption.value());
+		const std::string &authorDisplayName = info.AuthorDisplayNameOption.value();
+		if (!authorDisplayName.empty()) {
+			description->myAuthor = SingleAuthor::create(authorDisplayName, info.AuthorSortKeyOption.value());
+		}
 		description->myTitle = info.TitleOption.value();
 		description->mySeriesName = info.SeriesNameOption.value();
 		description->myNumberInSeries = info.NumberInSeriesOption.value();
@@ -126,20 +129,26 @@
 	if (description->myLanguage.empty()) {
 		description->myLanguage = PluginCollection::instance().DefaultLanguageOption.value();
 	}
-	{
-		BookInfo info(fileName);
-		info.AuthorDisplayNameOption.setValue(description->myAuthor->displayName());
-		info.AuthorSortKeyOption.setValue(description->myAuthor->sortKey());
-		info.TitleOption.setValue(description->myTitle);
-		info.SeriesNameOption.setValue(description->mySeriesName);
-		info.NumberInSeriesOption.setValue(description->myNumberInSeries);
-		info.LanguageOption.setValue(description->myLanguage);
-		info.EncodingOption.setValue(description->myEncoding);
-		description->saveTags(info.TagsOption);
-	}
+	description->saveInfo();
 	return description;
 }
 
+void BookDescription::saveInfo() {
+	BookInfo info(fileName());
+	info.AuthorDisplayNameOption.setValue(myAuthor->displayName());
+	info.AuthorSortKeyOption.setValue(myAuthor->sortKey());
+	info.TitleOption.setValue(myTitle);
+	info.SeriesNameOption.setValue(mySeriesName);
+	info.NumberInSeriesOption.setValue(myNumberInSeries);
+	info.LanguageOption.setValue(myLanguage);
+	info.EncodingOption.setValue(myEncoding);
+	saveTags(info.TagsOption);
+}
+
+void WritableBookDescription::saveInfo() {
+	myDescription.saveInfo();
+}
+
 BookDescription::BookDescription(const std::string &fileName) {
 	myFileName = fileName;
 	myAuthor = 0;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/description/BookDescription.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/description/BookDescription.h
--- fbreader-0.8.17/fbreader/src/description/BookDescription.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/description/BookDescription.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,6 +74,7 @@
 	bool addTag(const std::string &tag, bool check = true);
 	void saveTags() const;
 	void saveTags(ZLStringOption &tagsOption) const;
+	void saveInfo();
 
 private:
 	AuthorPtr myAuthor;
@@ -114,6 +115,8 @@
 	void cloneTag(const std::string &from, const std::string &to, bool includeSubTags);
 	void removeAllTags();
 
+	void saveInfo();
+
 private:
 	BookDescription &myDescription;
 };
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/description/BookDescriptionUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/description/BookDescriptionUtil.cpp
--- fbreader-0.8.17/fbreader/src/description/BookDescriptionUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/description/BookDescriptionUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,6 @@
 
 #include "BookDescriptionUtil.h"
 #include "BookDescription.h"
-#include "../formats/FormatPlugin.h"
 #include "../options/FBOptions.h"
 
 static const std::string SIZE = "Size";
@@ -66,14 +65,12 @@
 		int counter = 0;
 		zipDir->collectFiles(entries, false);
 		for (std::vector<std::string>::iterator zit = entries.begin(); zit != entries.end(); ++zit) {
-			if (PluginCollection::instance().plugin(ZLFile(*zit), true) != 0) {
-				std::string optionName = ENTRY;
-				ZLStringUtil::appendNumber(optionName, counter);
-				std::string fullName = zipPrefix + *zit;
-				ZLStringOption(FBCategoryKey::BOOKS, zipFile.path(), optionName, "").setValue(fullName);
-				BookInfo(fullName).reset();
-				++counter;
-			}
+			std::string optionName = ENTRY;
+			ZLStringUtil::appendNumber(optionName, counter);
+			std::string fullName = zipPrefix + *zit;
+			ZLStringOption(FBCategoryKey::BOOKS, zipFile.path(), optionName, "").setValue(fullName);
+			BookInfo(fullName).reset();
+			++counter;
 		}
 		ZLIntegerOption(FBCategoryKey::BOOKS, zipFile.path(), ENTRIES_NUMBER, -1).setValue(counter);
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/description/BookDescriptionUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/description/BookDescriptionUtil.h
--- fbreader-0.8.17/fbreader/src/description/BookDescriptionUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/description/BookDescriptionUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/encodingOption/EncodingOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/encodingOption/EncodingOptionEntry.cpp
--- fbreader-0.8.17/fbreader/src/encodingOption/EncodingOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/encodingOption/EncodingOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/encodingOption/EncodingOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/encodingOption/EncodingOptionEntry.h
--- fbreader-0.8.17/fbreader/src/encodingOption/EncodingOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/encodingOption/EncodingOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/external/ProgramCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/external/ProgramCollection.cpp
--- fbreader-0.8.17/fbreader/src/external/ProgramCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/external/ProgramCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/external/ProgramCollection.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/external/ProgramCollection.h
--- fbreader-0.8.17/fbreader/src/external/ProgramCollection.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/external/ProgramCollection.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/BookInfoDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/BookInfoDialog.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/BookInfoDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/BookInfoDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@
 
 void AuthorDisplayNameEntry::onValueSelected(int index) {
 	const std::vector<AuthorPtr> &authors = myInfoDialog.myCollection.authors();
-	myCurrentAuthor = authors[index];
+	myCurrentAuthor = (((size_t)index) < authors.size()) ? authors[index] : 0;
 	myInfoDialog.myAuthorSortKeyEntry->resetView();
 	myInfoDialog.mySeriesTitleEntry->resetView();
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/BookInfoDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/BookInfoDialog.h
--- fbreader-0.8.17/fbreader/src/fbreader/BookInfoDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/BookInfoDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/BooksOrderAction.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/BooksOrderAction.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/BooksOrderAction.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/BooksOrderAction.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "FBReader.h"
+#include "FBReaderActions.h"
+
+BooksOrderAction::BooksOrderAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::BOOK_COLLECTION_MODE) {
+}
+
+void BooksOrderAction::run() {
+	fbreader().refreshWindow();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/BookTextView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/BookTextView.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/BookTextView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/BookTextView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,8 +53,8 @@
 	saveState();
 }
 
-void BookTextView::setModel(shared_ptr<ZLTextModel> model, const std::string &fileName) {
-	FBView::setModel(model);
+void BookTextView::setModel(shared_ptr<ZLTextModel> model, const std::string &language, const std::string &fileName) {
+	FBView::setModel(model, language);
 
 	myFileName = fileName;
 
@@ -100,8 +100,8 @@
 
 	if (!cursor.isNull()) {
 		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, PARAGRAPH_OPTION_NAME, 0).setValue(cursor.paragraphCursor().index());
-		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, WORD_OPTION_NAME, 0).setValue(cursor.wordNumber());
-		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, CHAR_OPTION_NAME, 0).setValue(cursor.charNumber());
+		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, WORD_OPTION_NAME, 0).setValue(cursor.elementIndex());
+		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, CHAR_OPTION_NAME, 0).setValue(cursor.charIndex());
 		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, BUFFER_SIZE, 0).setValue(myPositionStack.size());
 		ZLIntegerOption(ZLCategoryKey::STATE, myFileName, POSITION_IN_BUFFER, 0).setValue(myCurrentPointInStack);
 
@@ -117,7 +117,7 @@
 }
 
 BookTextView::Position BookTextView::cursorPosition(const ZLTextWordCursor &cursor) const {
-	return Position(cursor.paragraphCursor().index(), cursor.wordNumber());
+	return Position(cursor.paragraphCursor().index(), cursor.elementIndex());
 }
 
 bool BookTextView::pushCurrentPositionIntoStack(bool doPushSamePosition) {
@@ -148,7 +148,7 @@
 	}
 }
 
-void BookTextView::gotoParagraph(int num, bool last) {
+void BookTextView::gotoParagraph(int num, bool end) {
 	if (!empty()) {
 		if (!myLockUndoStackChanges) {
 			if (myPositionStack.size() > myCurrentPointInStack) {
@@ -158,7 +158,7 @@
 			myCurrentPointInStack = myPositionStack.size();
 		}
 
-		FBView::gotoParagraph(num, last);
+		FBView::gotoParagraph(num, end);
 	}
 }
 
@@ -219,22 +219,23 @@
 	}
 }
 
-bool BookTextView::getHyperlinkId(const ZLTextElementArea &area, std::string &id, bool &isExternal) const {
+bool BookTextView::getHyperlinkInfo(const ZLTextElementArea &area, std::string &id, std::string &type) const {
 	if ((area.Kind != ZLTextElement::WORD_ELEMENT) &&
 			(area.Kind != ZLTextElement::IMAGE_ELEMENT)) {
 		return false;
 	}
 	ZLTextWordCursor cursor = startCursor();
-	cursor.moveToParagraph(area.ParagraphNumber);
+	cursor.moveToParagraph(area.ParagraphIndex);
 	cursor.moveToParagraphStart();
 	ZLTextKind hyperlinkKind = REGULAR;
-	for (int i = 0; i < area.TextElementNumber; ++i) {
+	for (int i = 0; i < area.ElementIndex; ++i) {
 		const ZLTextElement &element = cursor.element();
 		if (element.kind() == ZLTextElement::CONTROL_ELEMENT) {
 			const ZLTextControlEntry &control = ((const ZLTextControlElement&)element).entry();
 			if (control.isHyperlink()) {
 				hyperlinkKind = control.kind();
 				id = ((const ZLTextHyperlinkControlEntry&)control).label();
+				type = ((const ZLTextHyperlinkControlEntry&)control).hyperlinkType();
 			} else if (!control.isStart() && (control.kind() == hyperlinkKind)) {
 				hyperlinkKind = REGULAR;
 			}
@@ -242,17 +243,47 @@
 		cursor.nextWord();
 	}
 
-	isExternal = hyperlinkKind == EXTERNAL_HYPERLINK;
 	return hyperlinkKind != REGULAR;
 }
 
 bool BookTextView::_onStylusPress(int x, int y) {
+	return false;
+}
+
+bool BookTextView::onStylusClick(int x, int y, int count) {
+	const ZLTextElementArea *area = elementByCoordinates(x, y);
+	if (area != 0) {
+		std::string id;
+		std::string type;
+		if (getHyperlinkInfo(*area, id, type)) {
+			fbreader().tryShowFootnoteView(id, type);
+			return true;
+		}
+		
+		if (fbreader().isDictionarySupported() &&
+				fbreader().EnableSingleClickDictionaryOption.value()) {
+			const std::string txt = word(*area);
+			if (!txt.empty()) {
+				fbreader().openInDictionary(txt);
+				return true;
+			}
+		}
+	}
+
+	return FBView::onStylusClick(x, y, count);
+}
+
+bool BookTextView::_onStylusRelease(int x, int y) {
+	if (!isReleasedWithoutMotion()) {
+		return false;
+	}
+
 	const ZLTextElementArea *area = elementByCoordinates(x, y);
 	if (area != 0) {
 		std::string id;
-		bool isExternal;
-		if (getHyperlinkId(*area, id, isExternal)) {
-			fbreader().tryShowFootnoteView(id, isExternal);
+		std::string type;
+		if (getHyperlinkInfo(*area, id, type)) {
+			fbreader().tryShowFootnoteView(id, type);
 			return true;
 		}
 		
@@ -269,11 +300,11 @@
 	return false;
 }
 
-bool BookTextView::onStylusMove(int x, int y) {
+bool BookTextView::_onStylusMove(int x, int y) {
 	const ZLTextElementArea *area = elementByCoordinates(x, y);
 	std::string id;
-	bool isExternal;
-	fbreader().setHyperlinkCursor((area != 0) && getHyperlinkId(*area, id, isExternal));
+	std::string type;
+	fbreader().setHyperlinkCursor((area != 0) && getHyperlinkInfo(*area, id, type));
 	return true;
 }
 
@@ -324,3 +355,10 @@
 	gotoParagraph(0, false);
 	fbreader().refreshWindow();
 }
+
+void BookTextView::paint() {
+	FBView::paint();
+	std::string pn;
+	ZLStringUtil::appendNumber(pn, pageIndex());
+	fbreader().setVisualParameter(FBReader::PageIndexParameter, pn);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/BookTextView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/BookTextView.h
--- fbreader-0.8.17/fbreader/src/fbreader/BookTextView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/BookTextView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,11 +35,11 @@
 	BookTextView(FBReader &reader, shared_ptr<ZLPaintContext> context);
 	~BookTextView();
 
-	void setModel(shared_ptr<ZLTextModel> model, const std::string &fileName);
+	void setModel(shared_ptr<ZLTextModel> model, const std::string &language, const std::string &fileName);
 	void setContentsModel(shared_ptr<ZLTextModel> contentsModel);
 	void saveState();
 
-	void gotoParagraph(int num, bool last = false);
+	void gotoParagraph(int num, bool end = false);
 	bool canUndoPageMove();
 	void undoPageMove();
 	bool canRedoPageMove();
@@ -48,7 +48,9 @@
 	void scrollToHome();
 
 	bool _onStylusPress(int x, int y);
-	bool onStylusMove(int x, int y);
+	bool _onStylusMove(int x, int y);
+	bool _onStylusRelease(int x, int y);
+	bool onStylusClick(int x, int y, int count);
 
 private:
 	typedef std::pair<int,int> Position;
@@ -58,10 +60,12 @@
 
 	void preparePaintInfo();
 
-	bool getHyperlinkId(const ZLTextElementArea &area, std::string &id, bool &isExternal) const;
+	bool getHyperlinkInfo(const ZLTextElementArea &area, std::string &id, std::string &type) const;
 
 	shared_ptr<PositionIndicator> createPositionIndicator(const ZLTextPositionIndicatorInfo &info);
 
+	void paint();
+
 private:
 	class PositionIndicatorWithLabels : public PositionIndicator {
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/CollectionModel.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionModel.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/CollectionModel.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionModel.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,21 +29,23 @@
 const std::string CollectionModel::SeriesOrderImageId = "seriesOrder";
 const std::string CollectionModel::TagInfoImageId = "tagInfo";
 const std::string CollectionModel::RemoveTagImageId = "removeTag";
+const std::string CollectionModel::StrutImageId = "strut";
 
 CollectionModel::CollectionModel(CollectionView &view, BookCollection &collection) : ZLTextTreeModel(), myView(view), myCollection(collection) {
 	const std::string prefix = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
-	myImageMap[RemoveBookImageId] = new ZLFileImage("image/png", prefix + "tree-remove.png", 0);
+	myImageMap[RemoveBookImageId] = new ZLFileImage("image/png", prefix + "tree-removebook.png", 0);
 	myImageMap[BookInfoImageId] = new ZLFileImage("image/png", prefix + "tree-bookinfo.png", 0);
 	myImageMap[AuthorInfoImageId] = new ZLFileImage("image/png", prefix + "tree-authorinfo.png", 0);
-	myImageMap[SeriesOrderImageId] = new ZLFileImage("image/png", prefix + "tree-order.png", 0);
+	myImageMap[SeriesOrderImageId] = new ZLFileImage("image/png", prefix + "tree-order-series.png", 0);
 	myImageMap[TagInfoImageId] = new ZLFileImage("image/png", prefix + "tree-taginfo.png", 0);
 	myImageMap[RemoveTagImageId] = new ZLFileImage("image/png", prefix + "tree-removetag.png", 0);
+	myImageMap[StrutImageId] = new ZLFileImage("image/png", prefix + "tree-strut.png", 0);
 }
 
 CollectionModel::~CollectionModel() {
 }
 
-BookDescriptionPtr CollectionModel::bookByParagraphNumber(int num) {
+BookDescriptionPtr CollectionModel::bookByParagraphIndex(int num) {
 	if ((num < 0) || ((int)paragraphsNumber() <= num)) {
 		return 0;
 	}
@@ -51,38 +53,39 @@
 	return (it != myParagraphToBook.end()) ? it->second : 0;
 }
 
-const std::string &CollectionModel::tagByParagraphNumber(int num) {
+const std::string &CollectionModel::tagByParagraphIndex(int num) {
 	static const std::string EMPTY;
 	std::map<ZLTextParagraph*,std::string>::iterator it = myParagraphToTag.find((*this)[num]);
 	return (it != myParagraphToTag.end()) ? it->second : EMPTY;
 }
 
-const std::vector<int> &CollectionModel::paragraphNumbersByBook(BookDescriptionPtr book) {
+const std::vector<int> &CollectionModel::paragraphIndicesByBook(BookDescriptionPtr book) {
 	return myBookToParagraph[book];
 }
 
 void CollectionModel::build() {
 	if (myCollection.books().empty()) {
 		createParagraph();
-		insertText(LIBRARY_AUTHOR_ENTRY, ZLResource::resource("library")["noBooks"].value());
+		insertText(LIBRARY_ENTRY, ZLResource::resource("library")["noBooks"].value());
 	} else {
-		if (myView.ShowTagsOption.value()) {
-			buildWithTags();
+		if (myView.organizeByTags()) {
+			buildOrganizedByTags(false);
 		} else {
-			buildWithoutTags();
+			buildOrganizedByAuthors();
 		}
 	}
 }
 
-void CollectionModel::buildWithTags() {
+void CollectionModel::buildOrganizedByTags(bool buildAuthorTree) {
 	const ZLResource &resource = ZLResource::resource("library");
 
 	if (myView.ShowAllBooksTagOption.value()) {
 		ZLTextTreeParagraph *allBooksParagraph = createParagraph();
-		insertText(LIBRARY_AUTHOR_ENTRY, resource["allBooks"].value());
+		insertText(LIBRARY_ENTRY, resource["allBooks"].value());
+		addBidiReset();
 		insertImage(TagInfoImageId);
 		myParagraphToTag[allBooksParagraph] = CollectionView::SpecialTagAllBooks;
-		addBooks(myCollection.books(), allBooksParagraph);
+		addBooks(buildAuthorTree, myCollection.books(), allBooksParagraph);
 	}
 
 	std::map<std::string,Books> tagMap;
@@ -102,10 +105,11 @@
 
 	if (!booksWithoutTags.empty()) {
 		ZLTextTreeParagraph *booksWithoutTagsParagraph = createParagraph();
-		insertText(LIBRARY_AUTHOR_ENTRY, resource["booksWithoutTags"].value());
+		insertText(LIBRARY_ENTRY, resource["booksWithoutTags"].value());
+		addBidiReset();
 		insertImage(TagInfoImageId);
 		myParagraphToTag[booksWithoutTagsParagraph] = CollectionView::SpecialTagNoTagsBooks;
-		addBooks(booksWithoutTags, booksWithoutTagsParagraph);
+		addBooks(buildAuthorTree, booksWithoutTags, booksWithoutTagsParagraph);
 	}
 
 	std::vector<std::string> tagStack;
@@ -127,7 +131,7 @@
 						std::map<ZLTextTreeParagraph*,std::string>::iterator jt =
 							paragraphToTagMap.find(tagParagraph);
 						if (jt != paragraphToTagMap.end()) {
-							addBooks(tagMap[jt->second], tagParagraph);
+							addBooks(buildAuthorTree, tagMap[jt->second], tagParagraph);
 						}
 						tagParagraph = tagParagraph->parent();
 					}
@@ -139,7 +143,8 @@
 				tagStack.push_back(subTag);
 				tagParagraph = createParagraph(tagParagraph);
 				myParagraphToTag[tagParagraph] = fullTagName.substr(0, newIndex);
-				insertText(LIBRARY_AUTHOR_ENTRY, subTag);
+				insertText(LIBRARY_ENTRY, subTag);
+				addBidiReset();
 				insertImage(TagInfoImageId);
 				insertImage(RemoveTagImageId);
 			}
@@ -149,17 +154,63 @@
 	while (tagParagraph != 0) {
 		std::map<ZLTextTreeParagraph*,std::string>::iterator jt = paragraphToTagMap.find(tagParagraph);
 		if (jt != paragraphToTagMap.end()) {
-			addBooks(tagMap[jt->second], tagParagraph);
+			addBooks(buildAuthorTree, tagMap[jt->second], tagParagraph);
 		}
 		tagParagraph = tagParagraph->parent();
 	}
 }
 
-void CollectionModel::buildWithoutTags() {
-	addBooks(myCollection.books(), 0);
+void CollectionModel::buildOrganizedByAuthors() {
+	if (myView.ShowAllBooksTagOption.value()) {
+		const ZLResource &resource = ZLResource::resource("library");
+		ZLTextTreeParagraph *allBooksParagraph = createParagraph();
+		insertText(LIBRARY_ENTRY, resource["allBooks"].value());
+		addBidiReset();
+		insertImage(StrutImageId);
+		myParagraphToTag[allBooksParagraph] = CollectionView::SpecialTagAllBooks;
+		addBooks(false, myCollection.books(), allBooksParagraph);
+	}
+
+	addBooksTree(myCollection.books(), 0);
+}
+
+void CollectionModel::addBooks(bool asTree, const Books &books, ZLTextTreeParagraph *root) {
+	if (asTree) {
+		addBooksTree(books, root);
+	} else {
+		addBooksPlain(books, root);
+	}
+}
+
+void CollectionModel::addBooksPlain(const Books &books, ZLTextTreeParagraph *root) {
+	AuthorPtr author;
+	AuthorComparator comparator;
+
+	for (Books::const_iterator jt = books.begin(); jt != books.end(); ++jt) {
+		BookDescriptionPtr description = *jt;
+
+		if (author.isNull() || comparator(author, description->author())) {
+			author = description->author();
+		}
+
+		ZLTextTreeParagraph *bookParagraph = createParagraph(root);
+		insertText(LIBRARY_ENTRY, author->displayName() + ". ");
+		const std::string &seriesName = description->seriesName();
+		if (!seriesName.empty()) {
+			addText(seriesName + ". ");
+		}
+		addText(description->title());
+		addBidiReset();
+		insertImage(BookInfoImageId);
+		if (myCollection.isBookExternal(description)) {
+			insertImage(RemoveBookImageId);
+		}
+		myParagraphToBook[bookParagraph] = description;
+		myBookToParagraph[description].push_back(paragraphsNumber() - 1);
+	}
 }
 
-void CollectionModel::addBooks(const Books &books, ZLTextTreeParagraph *root) {
+void CollectionModel::addBooksTree(const Books &books, ZLTextTreeParagraph *root) {
 	AuthorPtr author;
 	AuthorComparator comparator;
 	ZLTextTreeParagraph *authorParagraph = 0;
@@ -172,7 +223,9 @@
 		if (author.isNull() || comparator(author, description->author())) {
 			author = description->author();
 			authorParagraph = createParagraph(root);
-			insertText(LIBRARY_AUTHOR_ENTRY, author->displayName());
+			insertText(LIBRARY_ENTRY, author->displayName());
+			addBidiReset();
+			insertImage(StrutImageId);
 			//insertImage(AuthorInfoImageId);
 			currentSeriesName.erase();
 			seriesParagraph = 0;
@@ -185,13 +238,16 @@
 		} else if (seriesName != currentSeriesName) {
 			currentSeriesName = seriesName;
 			seriesParagraph = createParagraph(authorParagraph);
-			insertText(LIBRARY_BOOK_ENTRY, seriesName);
+			insertText(LIBRARY_ENTRY, seriesName);
+			addBidiReset();
+			insertImage(StrutImageId);
 			//insertImage(SeriesOrderImageId);
 		}
 		ZLTextTreeParagraph *bookParagraph = createParagraph(
 			(seriesParagraph == 0) ? authorParagraph : seriesParagraph
 		);
-		insertText(LIBRARY_BOOK_ENTRY, description->title());
+		insertText(LIBRARY_ENTRY, description->title());
+		addBidiReset();
 		insertImage(BookInfoImageId);
 		if (myCollection.isBookExternal(description)) {
 			insertImage(RemoveBookImageId);
@@ -254,3 +310,7 @@
 		}
 	}
 }
+
+bool CollectionModel::empty() const {
+	return myCollection.books().empty();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/CollectionModel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionModel.h
--- fbreader-0.8.17/fbreader/src/fbreader/CollectionModel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionModel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,25 +38,30 @@
 	static const std::string SeriesOrderImageId;
 	static const std::string TagInfoImageId;
 	static const std::string RemoveTagImageId;
+	static const std::string StrutImageId;
 
 public:
 	CollectionModel(CollectionView &view, BookCollection &collection);
 	~CollectionModel();
 
-	BookDescriptionPtr bookByParagraphNumber(int num);
-	const std::vector<int> &paragraphNumbersByBook(BookDescriptionPtr book);
-	const std::string &tagByParagraphNumber(int num);
+	BookDescriptionPtr bookByParagraphIndex(int num);
+	const std::vector<int> &paragraphIndicesByBook(BookDescriptionPtr book);
+	const std::string &tagByParagraphIndex(int num);
 
 	void update();
 
 	void removeBook(BookDescriptionPtr book);
 
+	bool empty() const;
+
 private:
 	void build();
-	void buildWithTags();
-	void buildWithoutTags();
+	void buildOrganizedByTags(bool buildAuthorTree);
+	void buildOrganizedByAuthors();
 
-	void addBooks(const Books &books, ZLTextTreeParagraph *root);
+	void addBooks(bool asTree, const Books &books, ZLTextTreeParagraph *root);
+	void addBooksTree(const Books &books, ZLTextTreeParagraph *root);
+	void addBooksPlain(const Books &books, ZLTextTreeParagraph *root);
 
 	void insertText(FBTextKind kind, const std::string &text);
 	void insertImage(const std::string &id);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/CollectionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionView.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/CollectionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,34 +23,45 @@
 #include "CollectionView.h"
 #include "CollectionModel.h"
 #include "FBReader.h"
+#include "FBReaderActions.h"
 #include "BookInfoDialog.h"
 
 #include "../collection/BookList.h"
 
-static const std::string LIBRARY = "Library";
+class RebuildCollectionRunnable : public ZLRunnable {
+
+public:
+	RebuildCollectionRunnable(CollectionView &view) : myView(view) {}
+	void run() {
+		if (myView.myDoSynchronizeCollection) {
+			if (!myView.collection().synchronize()) {
+				return;
+			}
+		}
+		myView.collection().rebuild(true);
+		myView.myDoUpdateModel = true;
+		myView.collection().authors();
+	}
+
+private:
+	CollectionView &myView;
+};
 
 CollectionView::CollectionView(FBReader &reader, shared_ptr<ZLPaintContext> context) : FBView(reader, context),
-	ShowTagsOption(ZLCategoryKey::LOOK_AND_FEEL, LIBRARY, "ShowTags", true),
-	ShowAllBooksTagOption(ZLCategoryKey::LOOK_AND_FEEL, LIBRARY, "ShowAllBooksTag", true),
-	myUpdateModel(true) {
-	setModel(new CollectionModel(*this, myCollection));
-	myShowTags = ShowTagsOption.value();
+	ShowAllBooksTagOption(ZLCategoryKey::LOOK_AND_FEEL, "Library", "ShowAllBooksTag", false),
+	myDoSynchronizeCollection(false),
+	myDoUpdateModel(true) {
+	setModel(new CollectionModel(*this, myCollection), "");
+	myOrganizeByTags = organizeByTags();
 	myShowAllBooksList = ShowAllBooksTagOption.value();
 }
 
 CollectionView::~CollectionView() {
-	setModel(0);
-}
-
-void CollectionView::updateModel() {
-	myCollection.rebuild(true);
-	myUpdateModel = true;
+	setModel(0, "");
 }
 
 void CollectionView::synchronizeModel() {
-	if (myCollection.synchronize()) {
-		updateModel();
-	}
+	myDoSynchronizeCollection = true;
 }
 
 const std::string &CollectionView::caption() const {
@@ -58,47 +69,81 @@
 }
 
 void CollectionView::selectBook(BookDescriptionPtr book) {
-	if (myUpdateModel) {
+	mySelectedBook = book;
+
+	if (myDoUpdateModel) {
 		shared_ptr<ZLTextModel> oldModel = model();
-		setModel(0);
+		setModel(0, "");
 		((CollectionModel&)*oldModel).update();
-		setModel(oldModel);
-		myUpdateModel = false;
+		setModel(oldModel, "");
+		myDoUpdateModel = false;
 	}
-	collectionModel().removeAllMarks();
-	const std::vector<int> &toSelect = collectionModel().paragraphNumbersByBook(book);
-	for (std::vector<int>::const_iterator it = toSelect.begin(); it != toSelect.end(); ++it) {
-		highlightParagraph(*it);
-	}
-	if (!toSelect.empty()) {
-		gotoParagraph(toSelect[toSelect.size() - 1]);
-		scrollPage(false, ZLTextView::SCROLL_PERCENTAGE, 40);
+
+	if (!book.isNull()) {
+		collectionModel().removeAllMarks();
+		const std::vector<int> &toSelect = collectionModel().paragraphIndicesByBook(book);
+		for (std::vector<int>::const_iterator it = toSelect.begin(); it != toSelect.end(); ++it) {
+			highlightParagraph(*it);
+		}
+		if (!toSelect.empty()) {
+			preparePaintInfo();
+			gotoParagraph(toSelect[toSelect.size() - 1]);
+			scrollPage(false, ZLTextView::SCROLL_PERCENTAGE, 40);
+		}
 	}
 }
 
 void CollectionView::paint() {
-	if ((myShowTags != ShowTagsOption.value()) ||
+	if (myDoSynchronizeCollection) {
+		myDoSynchronizeCollection = false;
+		RebuildCollectionRunnable runnable(*this);
+		ZLDialogManager::instance().wait(ZLResourceKey("loadingBookList"), runnable);
+	}
+	if ((myOrganizeByTags != organizeByTags()) ||
 			(myShowAllBooksList != ShowAllBooksTagOption.value())) {
-		myShowTags = ShowTagsOption.value();
+		myOrganizeByTags = organizeByTags();
 		myShowAllBooksList = ShowAllBooksTagOption.value();
-		myUpdateModel = true;
+		myDoUpdateModel = true;
 	}
-	if (myUpdateModel) {
+	if (myDoUpdateModel) {
 		shared_ptr<ZLTextModel> oldModel = model();
-		setModel(0);
+		setModel(0, "");
 		((CollectionModel&)*oldModel).update();
-		setModel(oldModel);
-		myUpdateModel = false;
+		setModel(oldModel, "");
+		myDoUpdateModel = false;
+		selectBook(mySelectedBook);
 	}
 	FBView::paint();
 }
 
+bool CollectionView::_onStylusMove(int x, int y) {
+	const ZLTextElementArea *imageArea = elementByCoordinates(x, y);
+	if ((imageArea != 0) && (imageArea->Kind == ZLTextElement::IMAGE_ELEMENT)) {
+		fbreader().setHyperlinkCursor(true);
+		return true;
+	}
+
+	int index = paragraphIndexByCoordinates(x, y);
+	if (index != -1) {
+		BookDescriptionPtr book = collectionModel().bookByParagraphIndex(index);
+		if (!book.isNull()) {
+			fbreader().setHyperlinkCursor(true);
+			return true;
+		}
+	}
+
+	fbreader().setHyperlinkCursor(false);
+	return false;
+}
+
 bool CollectionView::_onStylusPress(int x, int y) {
+	fbreader().setHyperlinkCursor(false);
+
 	const ZLTextElementArea *imageArea = elementByCoordinates(x, y);
 	if ((imageArea != 0) && (imageArea->Kind == ZLTextElement::IMAGE_ELEMENT)) {
 		ZLTextWordCursor cursor = startCursor();
-		cursor.moveToParagraph(imageArea->ParagraphNumber);
-		cursor.moveTo(imageArea->TextElementNumber, 0);
+		cursor.moveToParagraph(imageArea->ParagraphIndex);
+		cursor.moveTo(imageArea->ElementIndex, 0);
 		const ZLTextElement &element = cursor.element();
 		if (element.kind() != ZLTextElement::IMAGE_ELEMENT) {
 			return false;
@@ -108,28 +153,28 @@
 		const std::string &id = imageElement.id();
 
 		if (id == CollectionModel::BookInfoImageId) {
-			editBookInfo(collectionModel().bookByParagraphNumber(imageArea->ParagraphNumber));
+			editBookInfo(collectionModel().bookByParagraphIndex(imageArea->ParagraphIndex));
 			return true;
 		} else if (id == CollectionModel::RemoveBookImageId) {
-			removeBook(collectionModel().bookByParagraphNumber(imageArea->ParagraphNumber));
+			removeBook(collectionModel().bookByParagraphIndex(imageArea->ParagraphIndex));
 			return true;
 		} else if (id == CollectionModel::RemoveTagImageId) {
-			removeTag(collectionModel().tagByParagraphNumber(imageArea->ParagraphNumber));
+			removeTag(collectionModel().tagByParagraphIndex(imageArea->ParagraphIndex));
 			return true;
 		} else if (id == CollectionModel::TagInfoImageId) {
-			editTagInfo(collectionModel().tagByParagraphNumber(imageArea->ParagraphNumber));
+			editTagInfo(collectionModel().tagByParagraphIndex(imageArea->ParagraphIndex));
 			return true;
 		} else {
 			return false;
 		}
 	}
 
-	int index = paragraphIndexByCoordinate(y);
+	int index = paragraphIndexByCoordinates(x, y);
 	if (index == -1) {
 		return false;
 	}
 
-	BookDescriptionPtr book = collectionModel().bookByParagraphNumber(index);
+	BookDescriptionPtr book = collectionModel().bookByParagraphIndex(index);
 	if (!book.isNull()) {
 		fbreader().openBook(book);
 		fbreader().showBookTextView();
@@ -142,7 +187,7 @@
 void CollectionView::editBookInfo(BookDescriptionPtr book) {
 	if (!book.isNull() && BookInfoDialog(myCollection, book->fileName()).dialog().run()) {
 		myCollection.rebuild(false);
-		myUpdateModel = true;
+		myDoUpdateModel = true;
 		selectBook(book);
 		application().refreshWindow();
 	}
@@ -153,6 +198,10 @@
 		return;
 	}
 
+	if (book == mySelectedBook) {
+		mySelectedBook = 0;
+	}
+
 	CollectionModel &cModel = collectionModel();
 
 	ZLResourceKey boxKey("removeBookBox");
@@ -177,7 +226,9 @@
 			gotoParagraph(index);
 		}
 		rebuildPaintInfo(true);
+		selectBook(mySelectedBook);
 		application().refreshWindow();
+		myCollection.rebuild(false);
 	}
 }
 
@@ -219,7 +270,9 @@
 	if (code != DONT_REMOVE) {
 		collectionModel().removeAllMarks();
 		myCollection.removeTag(tag, code == REMOVE_SUBTREE);
-		updateModel();
+		myCollection.rebuild(true);
+		myDoUpdateModel = true;
+		selectBook(mySelectedBook);
 		application().refreshWindow();
 	}
 }
@@ -227,3 +280,19 @@
 CollectionModel &CollectionView::collectionModel() {
 	return (CollectionModel&)*model();
 }
+
+void CollectionView::openWithBook(BookDescriptionPtr book) {
+	RebuildCollectionRunnable runnable(*this);
+	ZLDialogManager::instance().wait(ZLResourceKey("loadingBookList"), runnable);
+	if (book != 0) {
+		selectBook(book);
+	}
+}
+
+bool CollectionView::organizeByTags() const {
+	return ZLStringOption(ZLCategoryKey::LOOK_AND_FEEL, "ToggleButtonGroup", "booksOrder", "").value() == ActionCode::ORGANIZE_BOOKS_BY_TAG;
+}
+
+bool CollectionView::hasContents() const {
+	return !((CollectionModel&)*model()).empty();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/CollectionView_editTagInfo.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionView_editTagInfo.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/CollectionView_editTagInfo.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionView_editTagInfo.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -208,7 +208,9 @@
 		} else {
 			myCollection.cloneTag(tag, tagValue, includeSubtags);
 		}
-		updateModel();
+		myCollection.rebuild(true);
+		myDoUpdateModel = true;
+		selectBook(mySelectedBook);
 		application().refreshWindow();
 		break;
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/CollectionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionView.h
--- fbreader-0.8.17/fbreader/src/fbreader/CollectionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/CollectionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,6 @@
 	static const std::string SpecialTagNoTagsBooks;
 
 public:
-	ZLBooleanOption ShowTagsOption;
 	ZLBooleanOption ShowAllBooksTagOption;
 
 public:
@@ -46,16 +45,22 @@
 	const std::string &caption() const;
 
 	bool _onStylusPress(int x, int y);
+	bool _onStylusMove(int x, int y);
 
 	void paint();
-	void updateModel();
 	void synchronizeModel();
 
-	void selectBook(BookDescriptionPtr book);
+	void openWithBook(BookDescriptionPtr book);
 
 	BookCollection &collection();
 
+	bool organizeByTags() const;
+
 private:
+	bool hasContents() const;
+
+	void selectBook(BookDescriptionPtr book);
+
 	CollectionModel &collectionModel();
 
 	void editBookInfo(BookDescriptionPtr book);
@@ -68,11 +73,15 @@
 
 private:
 	BookCollection myCollection;
+	BookDescriptionPtr mySelectedBook;
 	bool myTreeStateIsFrozen;
-	bool myUpdateModel;
+	bool myDoSynchronizeCollection;
+	bool myDoUpdateModel;
 
-	bool myShowTags;
+	bool myOrganizeByTags;
 	bool myShowAllBooksList;
+
+friend class RebuildCollectionRunnable;
 };
 
 inline BookCollection &CollectionView::collection() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/ContentsView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/ContentsView.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/ContentsView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/ContentsView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,22 @@
 ContentsView::~ContentsView() {
 }
 
+bool ContentsView::_onStylusMove(int x, int y) {
+	int index = paragraphIndexByCoordinates(x, y);
+	if ((index < 0) || ((int)model()->paragraphsNumber() <= index)) {
+		fbreader().setHyperlinkCursor(false);
+		return true;
+	}
+
+	const ContentsModel &contentsModel = (const ContentsModel&)*model();
+	const ZLTextTreeParagraph *paragraph = (const ZLTextTreeParagraph*)contentsModel[index];
+	
+	fbreader().setHyperlinkCursor(contentsModel.reference(paragraph) >= 0);
+	return true;
+}
+
 bool ContentsView::_onStylusPress(int x, int y) {
-	int index = paragraphIndexByCoordinate(y);
+	int index = paragraphIndexByCoordinates(x, y);
 	if ((index < 0) || ((int)model()->paragraphsNumber() <= index)) {
 		return false;
 	}
@@ -42,7 +56,7 @@
 	
 	int reference = contentsModel.reference(paragraph);
 
-	if (reference != -1) {
+	if (reference >= 0) {
 		fbreader().bookTextView().gotoParagraph(reference);
 		fbreader().showBookTextView();
 	}
@@ -58,7 +72,7 @@
 	const ZLTextWordCursor &cursor = fbreader().bookTextView().startCursor();
 	if (!cursor.isNull()) {
 		long reference = cursor.paragraphCursor().index();
-		bool startOfParagraph = cursor.wordNumber() == 0;
+		bool startOfParagraph = cursor.elementIndex() == 0;
 		if (cursor.isEndOfParagraph()) {
 			++reference;
 			startOfParagraph = true;
@@ -82,6 +96,7 @@
 	model()->removeAllMarks();
 	const size_t selected = currentTextViewParagraph();
 	highlightParagraph(selected);
+	preparePaintInfo();
 	gotoParagraph(selected);
 	scrollPage(false, ZLTextView::SCROLL_PERCENTAGE, 40);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/ContentsView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/ContentsView.h
--- fbreader-0.8.17/fbreader/src/fbreader/ContentsView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/ContentsView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
 
 private:
 	bool _onStylusPress(int x, int y);
+	bool _onStylusMove(int x, int y);
 };
 
 #endif /* __CONTENTSVIEW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBFileHandler.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBFileHandler.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/FBFileHandler.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBFileHandler.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBFileHandler.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBFileHandler.h
--- fbreader-0.8.17/fbreader/src/fbreader/FBFileHandler.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBFileHandler.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBReaderActionCode.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReaderActionCode.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/FBReaderActionCode.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReaderActionCode.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,9 @@
 
 #include "FBReaderActions.h"
 
+const std::string ActionCode::SHOW_READING = "showReading";
 const std::string ActionCode::SHOW_COLLECTION = "showLibrary";
+const std::string ActionCode::SHOW_NET_LIBRARY = "showNetLibrary";
 const std::string ActionCode::SHOW_OPTIONS = "preferences";
 const std::string ActionCode::UNDO = "undo";
 const std::string ActionCode::REDO = "redo";
@@ -33,7 +35,7 @@
 const std::string ActionCode::SMALL_SCROLL_BACKWARD = "smallScrollBackward";
 const std::string ActionCode::MOUSE_SCROLL_FORWARD = "mouseScrollForward";
 const std::string ActionCode::MOUSE_SCROLL_BACKWARD = "mouseScrollBackward";
-const std::string ActionCode::TAP_SCROLL_FORWARD = "tapScroolForward";
+const std::string ActionCode::TAP_SCROLL_FORWARD = "tapScrollForward";
 const std::string ActionCode::TAP_SCROLL_BACKWARD = "tapScrollBackward";
 const std::string ActionCode::SCROLL_TO_HOME = "gotoHome";
 const std::string ActionCode::SCROLL_TO_START_OF_TEXT = "gotoSectionStart";
@@ -48,7 +50,6 @@
 const std::string ActionCode::SHOW_BOOK_INFO = "bookInfo";
 const std::string ActionCode::SHOW_HELP = "showHelp";
 const std::string ActionCode::ROTATE_SCREEN = "rotate";
-const std::string ActionCode::SHOW_LAST_BOOKS = "showRecent";
 const std::string ActionCode::QUIT = "quit";
 const std::string ActionCode::OPEN_PREVIOUS_BOOK = "previousBook";
 const std::string ActionCode::GOTO_NEXT_TOC_SECTION = "nextTOCSection";
@@ -57,3 +58,8 @@
 const std::string ActionCode::CLEAR_SELECTION = "clearSelection";
 const std::string ActionCode::OPEN_SELECTED_TEXT_IN_DICTIONARY = "openInDictionary";
 const std::string ActionCode::GOTO_PAGE_NUMBER = "gotoPageNumber";
+const std::string ActionCode::GOTO_PAGE_NUMBER_WITH_PARAMETER = "gotoPageNumberWithParameter";
+const std::string ActionCode::SEARCH_ON_NETWORK = "searchOnNetwork";
+const std::string ActionCode::ADVANCED_SEARCH_ON_NETWORK = "advancedSearchOnNetwork";
+const std::string ActionCode::ORGANIZE_BOOKS_BY_AUTHOR = "byAuthor";
+const std::string ActionCode::ORGANIZE_BOOKS_BY_TAG = "byTag";
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBReaderActions.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReaderActions.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/FBReaderActions.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReaderActions.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <algorithm>
+
 #include <ZLDialogManager.h>
 #include <ZLDialog.h>
 #include <ZLOptionsDialog.h>
@@ -29,7 +31,6 @@
 #include "FBReaderActions.h"
 #include "BookTextView.h"
 #include "ContentsView.h"
-#include "RecentBooksView.h"
 #include "FBFileHandler.h"
 
 #include "../bookmodel/BookModel.h"
@@ -41,8 +42,8 @@
 ModeDependentAction::ModeDependentAction(FBReader &fbreader, int visibleInModes) : FBAction(fbreader), myVisibleInModes(visibleInModes) {
 }
 
-bool ModeDependentAction::isVisible() {
-	return fbreader().getMode() & myVisibleInModes;
+bool ModeDependentAction::isVisible() const {
+	return fbreader().mode() & myVisibleInModes;
 }
 
 SetModeAction::SetModeAction(FBReader &fbreader, FBReader::ViewMode modeToSet, int visibleInModes) : ModeDependentAction(fbreader, visibleInModes), myModeToSet(modeToSet) {
@@ -77,26 +78,14 @@
 	OptionsDialog(f).dialog().run();
 }
 
-ShowContentsAction::ShowContentsAction(FBReader &fbreader) : FBAction(fbreader) {
-}
-
-bool ShowContentsAction::isVisible() {
-	if (((ContentsView&)*fbreader().myContentsView).isEmpty()) {
-		return false;
-	}
-	FBReader::ViewMode mode = fbreader().getMode();
-	return (mode == FBReader::BOOK_TEXT_MODE) || (mode == FBReader::FOOTNOTE_MODE);
-}
-
-void ShowContentsAction::run() {
-	fbreader().setMode(FBReader::CONTENTS_MODE);
+ShowContentsAction::ShowContentsAction(FBReader &fbreader) : SetModeAction(fbreader, FBReader::CONTENTS_MODE, FBReader::BOOK_TEXT_MODE) {
 }
 
-AddBookAction::AddBookAction(FBReader &fbreader) : FBAction(fbreader) {
+bool ShowContentsAction::isVisible() const {
+	return ModeDependentAction::isVisible() && !((ContentsView&)*fbreader().myContentsView).isEmpty();
 }
 
-bool AddBookAction::isVisible() {
-	return fbreader().getMode() != FBReader::FOOTNOTE_MODE;
+AddBookAction::AddBookAction(FBReader &fbreader, int visibleInModes) : ModeDependentAction(fbreader, visibleInModes) {
 }
 
 void AddBookAction::run() {
@@ -114,6 +103,14 @@
 ScrollToHomeAction::ScrollToHomeAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::BOOK_TEXT_MODE) {
 }
 
+bool ScrollToHomeAction::isEnabled() const {
+	if (!isVisible()) {
+		return false;
+	}
+	ZLTextWordCursor cursor = fbreader().bookTextView().startCursor();
+	return cursor.isNull() || !cursor.isStartOfParagraph() || !cursor.paragraphCursor().isFirst();
+}
+
 void ScrollToHomeAction::run() {
 	fbreader().bookTextView().scrollToHome();
 }
@@ -121,6 +118,14 @@
 ScrollToStartOfTextAction::ScrollToStartOfTextAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::BOOK_TEXT_MODE) {
 }
 
+bool ScrollToStartOfTextAction::isEnabled() const {
+	if (!isVisible()) {
+		return false;
+	}
+	ZLTextWordCursor cursor = fbreader().bookTextView().startCursor();
+	return cursor.isNull() || !cursor.isStartOfParagraph() || !cursor.paragraphCursor().isFirst();
+}
+
 void ScrollToStartOfTextAction::run() {
 	fbreader().bookTextView().scrollToStartOfText();
 }
@@ -128,6 +133,14 @@
 ScrollToEndOfTextAction::ScrollToEndOfTextAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::BOOK_TEXT_MODE) {
 }
 
+bool ScrollToEndOfTextAction::isEnabled() const {
+	if (!isVisible()) {
+		return false;
+	}
+	ZLTextWordCursor cursor = fbreader().bookTextView().endCursor();
+	return cursor.isNull() || !cursor.isEndOfParagraph() || !cursor.paragraphCursor().isLast();
+}
+
 void ScrollToEndOfTextAction::run() {
 	fbreader().bookTextView().scrollToEndOfText();
 }
@@ -142,16 +155,16 @@
 	}
 }
 
-UndoAction::UndoAction(FBReader &fbreader) : FBAction(fbreader) {
+UndoAction::UndoAction(FBReader &fbreader, int visibleInModes) : ModeDependentAction(fbreader, visibleInModes) {
 }
 
-bool UndoAction::isEnabled() {
-	return (fbreader().getMode() != FBReader::BOOK_TEXT_MODE) ||
+bool UndoAction::isEnabled() const {
+	return (fbreader().mode() != FBReader::BOOK_TEXT_MODE) ||
 					fbreader().bookTextView().canUndoPageMove();
 }
 
 void UndoAction::run() {
-	if (fbreader().getMode() == FBReader::BOOK_TEXT_MODE) {
+	if (fbreader().mode() == FBReader::BOOK_TEXT_MODE) {
 		fbreader().bookTextView().undoPageMove();
 	} else {
 		fbreader().restorePreviousMode();
@@ -161,7 +174,7 @@
 RedoAction::RedoAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::BOOK_TEXT_MODE) {
 }
 
-bool RedoAction::isEnabled() {
+bool RedoAction::isEnabled() const {
 	return isVisible() && fbreader().bookTextView().canRedoPageMove();
 }
 
@@ -172,7 +185,7 @@
 ScrollingAction::ScrollingAction(FBReader &fbreader, const FBReader::ScrollingOptions &options, bool forward) : FBAction(fbreader), myOptions(options), myForward(forward) {
 }
 
-bool ScrollingAction::isEnabled() {
+bool ScrollingAction::isEnabled() const {
 	return
 		(&myOptions != &fbreader().TapScrollingOptions) ||
 		fbreader().EnableTapScrollingOption.value();
@@ -201,8 +214,7 @@
 			default:
 				break;
 		}
-		((ZLTextView&)*view).scrollPage(myForward, oType, oValue);
-		fbreader().refreshWindow();
+		((FBView&)*view).scrollAndUpdatePage(myForward, oType, oValue);
 		fbreader().myLastScrollingTime = ZLTime();
 	}
 }
@@ -210,6 +222,15 @@
 ChangeFontSizeAction::ChangeFontSizeAction(FBReader &fbreader, int delta) : FBAction(fbreader), myDelta(delta) {
 }
 
+bool ChangeFontSizeAction::isEnabled() const {
+	ZLIntegerRangeOption &option = ZLTextStyleCollection::instance().baseStyle().FontSizeOption;
+	if (myDelta < 0) {
+		return option.value() > option.minValue();
+	} else {
+		return option.value() < option.maxValue();
+	}
+}
+
 void ChangeFontSizeAction::run() {
 	ZLIntegerRangeOption &option = ZLTextStyleCollection::instance().baseStyle().FontSizeOption;
 	option.setValue(option.value() + myDelta);
@@ -220,15 +241,15 @@
 OpenPreviousBookAction::OpenPreviousBookAction(FBReader &fbreader) : FBAction(fbreader) {
 }
 
-bool OpenPreviousBookAction::isVisible() {
-	if ((fbreader().getMode() != FBReader::BOOK_TEXT_MODE) && (fbreader().getMode() != FBReader::CONTENTS_MODE)) {
+bool OpenPreviousBookAction::isVisible() const {
+	if ((fbreader().mode() != FBReader::BOOK_TEXT_MODE) && (fbreader().mode() != FBReader::CONTENTS_MODE)) {
 		return false;
 	}
-	return ((RecentBooksView&)*fbreader().myRecentBooksView).lastBooks().books().size() > 1;
+	return fbreader().recentBooks().books().size() > 1;
 }
 
 void OpenPreviousBookAction::run() {
-	Books books = ((RecentBooksView&)*fbreader().myRecentBooksView).lastBooks().books();
+	Books books = fbreader().recentBooks().books();
 	fbreader().openBook(books[1]);
 	fbreader().refreshWindow();
 	fbreader().resetWindowCaption();
@@ -238,11 +259,27 @@
 }
 
 void CancelAction::run() {
-	if (fbreader().getMode() != FBReader::BOOK_TEXT_MODE) {
-		fbreader().restorePreviousMode();
-	} else if (fbreader().isFullscreen()) {
-		fbreader().setFullscreen(false);
-	} else if (fbreader().QuitOnCancelOption.value()) {
+	switch (fbreader().myActionOnCancel) {
+		case FBReader::UNFULLSCREEN:
+			if (fbreader().isFullscreen()) {
+				fbreader().setFullscreen(false);
+				return;
+			} else if (fbreader().mode() != FBReader::BOOK_TEXT_MODE) {
+				fbreader().restorePreviousMode();
+				return;
+			}
+			break;
+		case FBReader::RETURN_TO_TEXT_MODE:
+			if (fbreader().mode() != FBReader::BOOK_TEXT_MODE) {
+				fbreader().restorePreviousMode();
+				return;
+			} else if (fbreader().isFullscreen()) {
+				fbreader().setFullscreen(false);
+				return;
+			}
+			break;
+	}
+	if (fbreader().QuitOnCancelOption.value()) {
 		fbreader().quit();
 	}
 }
@@ -250,10 +287,30 @@
 ToggleIndicatorAction::ToggleIndicatorAction(FBReader &fbreader) : FBAction(fbreader) {
 }
 
+bool ToggleIndicatorAction::isVisible() const {
+	ZLIntegerRangeOption &option = FBView::commonIndicatorInfo().TypeOption;
+	switch (option.value()) {
+		case FBIndicatorStyle::FB_INDICATOR:
+		case FBIndicatorStyle::NONE:
+			return true;
+	}
+	return false;
+}
+
 void ToggleIndicatorAction::run() {
-	ZLBooleanOption &option = FBView::commonIndicatorInfo().ShowOption;
-	option.setValue(!option.value());
-	fbreader().refreshWindow();
+	ZLIntegerRangeOption &option = FBView::commonIndicatorInfo().TypeOption;
+	switch (option.value()) {
+		case FBIndicatorStyle::OS_SCROLLBAR:
+			break;
+		case FBIndicatorStyle::FB_INDICATOR:
+			option.setValue(FBIndicatorStyle::NONE);
+			fbreader().refreshWindow();
+			break;
+		case FBIndicatorStyle::NONE:
+			option.setValue(FBIndicatorStyle::FB_INDICATOR);
+			fbreader().refreshWindow();
+			break;
+	}
 }
 
 QuitAction::QuitAction(FBReader &fbreader) : FBAction(fbreader) {
@@ -266,8 +323,8 @@
 GotoNextTOCSectionAction::GotoNextTOCSectionAction(FBReader &fbreader) : FBAction(fbreader) {
 }
 
-bool GotoNextTOCSectionAction::isVisible() {
-	if (fbreader().getMode() != FBReader::BOOK_TEXT_MODE) {
+bool GotoNextTOCSectionAction::isVisible() const {
+	if (fbreader().mode() != FBReader::BOOK_TEXT_MODE) {
 		return false;
 	}
 	const ContentsView &contentsView = (const ContentsView&)*fbreader().myContentsView;
@@ -275,7 +332,7 @@
 	return !model.isNull() && (model->paragraphsNumber() > 1);
 }
 
-bool GotoNextTOCSectionAction::isEnabled() {
+bool GotoNextTOCSectionAction::isEnabled() const {
 	const ContentsView &contentsView = (const ContentsView&)*fbreader().myContentsView;
 	shared_ptr<ZLTextModel> model = contentsView.model();
 	return !model.isNull() && ((int)contentsView.currentTextViewParagraph() < (int)model->paragraphsNumber() - 1);
@@ -286,15 +343,17 @@
 	size_t current = contentsView.currentTextViewParagraph();
 	const ContentsModel &contentsModel = (const ContentsModel&)*contentsView.model();
 	int reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current + 1]));
-	((ZLTextView&)*fbreader().myBookTextView).gotoParagraph(reference);
-	fbreader().refreshWindow();
+	if (reference != -1) {
+		((ZLTextView&)*fbreader().myBookTextView).gotoParagraph(reference);
+		fbreader().refreshWindow();
+	}
 }
 
 GotoPreviousTOCSectionAction::GotoPreviousTOCSectionAction(FBReader &fbreader) : FBAction(fbreader) {
 }
 
-bool GotoPreviousTOCSectionAction::isVisible() {
-	if (fbreader().getMode() != FBReader::BOOK_TEXT_MODE) {
+bool GotoPreviousTOCSectionAction::isVisible() const {
+	if (fbreader().mode() != FBReader::BOOK_TEXT_MODE) {
 		return false;
 	}
 	const ContentsView &contentsView = (const ContentsView&)*fbreader().myContentsView;
@@ -302,7 +361,7 @@
 	return !model.isNull() && (model->paragraphsNumber() > 1);
 }
 
-bool GotoPreviousTOCSectionAction::isEnabled() {
+bool GotoPreviousTOCSectionAction::isEnabled() const {
 	const ContentsView &contentsView = (const ContentsView&)*fbreader().myContentsView;
 	shared_ptr<ZLTextModel> model = contentsView.model();
 	if (model.isNull()) {
@@ -318,11 +377,11 @@
 		if (cursor.isNull()) {
 			return false;
 		}
-		if (cursor.wordNumber() > 0) {
+		if (cursor.elementIndex() > 0) {
 			return true;
 		}
 		return
-			contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[tocIndex])) >
+			contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[0])) >
 			(int)cursor.paragraphCursor().index();
 	}
 	return false;
@@ -336,56 +395,93 @@
 	int reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current]));
 	const ZLTextWordCursor &cursor = fbreader().bookTextView().startCursor();
 	if (!cursor.isNull() &&
-			(cursor.wordNumber() == 0) &&
-			(reference == (int)cursor.paragraphCursor().index())) {
-		reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1]));
+			(cursor.elementIndex() == 0)) {
+		int paragraphIndex = cursor.paragraphCursor().index();
+		if (reference == paragraphIndex) {
+			reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1]));
+		} else if (reference == paragraphIndex - 1) {
+			const ZLTextModel &textModel = *fbreader().bookTextView().model();
+			const ZLTextParagraph *para = textModel[paragraphIndex];
+			if ((para != 0) && (para->kind() == ZLTextParagraph::END_OF_SECTION_PARAGRAPH)) {
+				reference = contentsModel.reference(((const ZLTextTreeParagraph*)contentsModel[current - 1]));
+			}
+		}
 	}
-	((ZLTextView&)*fbreader().myBookTextView).gotoParagraph(reference);
-	fbreader().refreshWindow();
+	if (reference != -1) {
+		((ZLTextView&)*fbreader().myBookTextView).gotoParagraph(reference);
+		fbreader().refreshWindow();
+	}
+}
+
+GotoPageNumber::GotoPageNumber(FBReader &fbreader, const std::string &parameter) : ModeDependentAction(fbreader, FBReader::BOOK_TEXT_MODE), myParameter(parameter) {
 }
 
-GotoPageNumber::GotoPageNumber(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::BOOK_TEXT_MODE) {
+bool GotoPageNumber::isVisible() const {
+	return
+		ModeDependentAction::isVisible() &&
+		!fbreader().bookTextView().hasMultiSectionModel();
 }
 
-bool GotoPageNumber::isEnabled() {
+bool GotoPageNumber::isEnabled() const {
 	return ModeDependentAction::isEnabled() && (fbreader().bookTextView().pageNumber() > 1);
 }
 
 void GotoPageNumber::run() {
-	shared_ptr<ZLDialog> gotoPageDialog = ZLDialogManager::instance().createDialog(ZLResourceKey("gotoPageDialog"));
-
+	int pageIndex = 0;
 	const int pageNumber = fbreader().bookTextView().pageNumber();
-	ZLIntegerRangeOption pageNumberOption(ZLCategoryKey::CONFIG, "gotoPageDialog", "Number", 0, pageNumber, pageNumber);
-	gotoPageDialog->addOption(ZLResourceKey("pageNumber"), new ZLSimpleSpinOptionEntry(pageNumberOption, 1));
-	gotoPageDialog->addButton(ZLDialogManager::OK_BUTTON, true);
-	gotoPageDialog->addButton(ZLDialogManager::CANCEL_BUTTON, false);
-
-	if (gotoPageDialog->run()) {
-		gotoPageDialog->acceptValues();
-		fbreader().bookTextView().gotoPage(pageNumberOption.value());
-		fbreader().refreshWindow();
+
+	if (!myParameter.empty()) {
+		const std::string value = fbreader().visualParameter(myParameter);
+		if (value.empty()) {
+			return;
+		}
+		pageIndex = atoi(value.c_str());
+	} else {
+		shared_ptr<ZLDialog> gotoPageDialog = ZLDialogManager::instance().createDialog(ZLResourceKey("gotoPageDialog"));
+
+		ZLIntegerRangeOption pageIndexOption(ZLCategoryKey::CONFIG, "gotoPageDialog", "Index", 1, pageNumber, pageIndex);
+		gotoPageDialog->addOption(ZLResourceKey("pageNumber"), new ZLSimpleSpinOptionEntry(pageIndexOption, 1));
+		gotoPageDialog->addButton(ZLDialogManager::OK_BUTTON, true);
+		gotoPageDialog->addButton(ZLDialogManager::CANCEL_BUTTON, false);
+		if (gotoPageDialog->run()) {
+			gotoPageDialog->acceptValues();
+			pageIndex = pageIndexOption.value();
+		} else {
+			return;
+		}
 	}
+
+	fbreader().bookTextView().gotoPage(std::max(1, std::min(pageIndex, pageNumber)));
+	fbreader().refreshWindow();
 }
 
 SelectionAction::SelectionAction(FBReader &fbreader) : FBAction(fbreader) {
 }
 
-bool SelectionAction::isVisible() {
+bool SelectionAction::isVisible() const {
 	return !fbreader().currentView().isNull();
 }
 
-bool SelectionAction::isEnabled() {
-	return isVisible() && !textView().selectionModel().getText().empty();
+bool SelectionAction::isEnabled() const {
+	if (!isVisible()) {
+		return false;
+	}
+	const ZLTextSelectionModel &selectionModel = textView().selectionModel();
+	return !selectionModel.text().empty() || !selectionModel.image().isNull();
 }
 
 ZLTextView &SelectionAction::textView() {
 	return (ZLTextView&)*fbreader().currentView();
 }
 
+const ZLTextView &SelectionAction::textView() const {
+	return (ZLTextView&)*fbreader().currentView();
+}
+
 CopySelectedTextAction::CopySelectedTextAction(FBReader &fbreader) : SelectionAction(fbreader) {
 }
 
-bool CopySelectedTextAction::isVisible() {
+bool CopySelectedTextAction::isVisible() const {
 	return SelectionAction::isVisible() && ZLDialogManager::instance().isClipboardSupported(ZLDialogManager::CLIPBOARD_MAIN);
 }
 
@@ -396,12 +492,12 @@
 OpenSelectedTextInDictionaryAction::OpenSelectedTextInDictionaryAction(FBReader &fbreader) : SelectionAction(fbreader) {
 }
 
-bool OpenSelectedTextInDictionaryAction::isVisible() {
+bool OpenSelectedTextInDictionaryAction::isVisible() const {
 	return SelectionAction::isVisible() && fbreader().isDictionarySupported();
 }
 
 void OpenSelectedTextInDictionaryAction::run() {
-	fbreader().openInDictionary(textView().selectionModel().getText());
+	fbreader().openInDictionary(textView().selectionModel().text());
 }
 
 ClearSelectionAction::ClearSelectionAction(FBReader &fbreader) : SelectionAction(fbreader) {
@@ -411,3 +507,13 @@
 	textView().selectionModel().clear();
 	fbreader().refreshWindow();
 }
+
+FBFullscreenAction::FBFullscreenAction(FBReader &fbreader) : ZLApplication::FullscreenAction(fbreader), myFBReader(fbreader) {
+}
+
+void FBFullscreenAction::run() {
+	if (!myFBReader.isFullscreen()) {
+		myFBReader.myActionOnCancel = FBReader::UNFULLSCREEN;
+	}
+	FullscreenAction::run();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBReaderActions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReaderActions.h
--- fbreader-0.8.17/fbreader/src/fbreader/FBReaderActions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReaderActions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,9 @@
 class ActionCode {
 
 public:
+	static const std::string SHOW_READING;
 	static const std::string SHOW_COLLECTION;
+	static const std::string SHOW_NET_LIBRARY;
 	static const std::string SHOW_OPTIONS;
 	static const std::string UNDO;
 	static const std::string REDO;
@@ -58,7 +60,6 @@
 	static const std::string SHOW_BOOK_INFO;
 	static const std::string SHOW_HELP;
 	static const std::string ROTATE_SCREEN;
-	static const std::string SHOW_LAST_BOOKS;
 	static const std::string QUIT;
 	static const std::string OPEN_PREVIOUS_BOOK;
 	static const std::string GOTO_NEXT_TOC_SECTION;
@@ -67,6 +68,11 @@
 	static const std::string CLEAR_SELECTION;
 	static const std::string OPEN_SELECTED_TEXT_IN_DICTIONARY;
 	static const std::string GOTO_PAGE_NUMBER;
+	static const std::string GOTO_PAGE_NUMBER_WITH_PARAMETER;
+	static const std::string SEARCH_ON_NETWORK;
+	static const std::string ADVANCED_SEARCH_ON_NETWORK;
+	static const std::string ORGANIZE_BOOKS_BY_AUTHOR;
+	static const std::string ORGANIZE_BOOKS_BY_TAG;
 
 private:
 	ActionCode();
@@ -77,6 +83,7 @@
 protected:
 	FBAction(FBReader &fbreader);
 	FBReader &fbreader();
+	const FBReader &fbreader() const;
 
 private:
 	FBReader &myFBReader;
@@ -88,7 +95,7 @@
 	ModeDependentAction(FBReader &fbreader, int visibleInModes);
 
 public:
-	bool isVisible();
+	bool isVisible() const;
 
 private:
 	int myVisibleInModes;
@@ -118,19 +125,24 @@
 	void run();
 };
 
-class ShowContentsAction : public FBAction {
+class ShowContentsAction : public SetModeAction {
 
 public:
 	ShowContentsAction(FBReader &fbreader);
-	bool isVisible();
-	void run();
+	bool isVisible() const;
+};
+
+class ShowNetworkLibraryAction : public SetModeAction {
+
+public:
+	ShowNetworkLibraryAction(FBReader &fbreader);
+	bool isVisible() const;
 };
 
-class AddBookAction : public FBAction {
+class AddBookAction : public ModeDependentAction {
 
 public:
-	AddBookAction(FBReader &fbreader);
-	bool isVisible();
+	AddBookAction(FBReader &fbreader, int visibleInModes);
 	void run();
 };
 
@@ -145,7 +157,7 @@
 
 public:
 	ScrollingAction(FBReader &fbreader, const FBReader::ScrollingOptions &options, bool forward);
-	bool isEnabled();
+	bool isEnabled() const;
 	bool useKeyDelay() const;
 	void run();
 
@@ -158,6 +170,7 @@
 
 public:
 	ScrollToHomeAction(FBReader &fbreader);
+	bool isEnabled() const;
 	void run();
 };
 
@@ -165,6 +178,7 @@
 
 public:
 	ScrollToStartOfTextAction(FBReader &fbreader);
+	bool isEnabled() const;
 	void run();
 };
 
@@ -172,14 +186,15 @@
 
 public:
 	ScrollToEndOfTextAction(FBReader &fbreader);
+	bool isEnabled() const;
 	void run();
 };
 
-class UndoAction : public FBAction {
+class UndoAction : public ModeDependentAction {
 
 public:
-	UndoAction(FBReader &fbreader);
-	bool isEnabled();
+	UndoAction(FBReader &fbreader, int visibleInModes);
+	bool isEnabled() const;
 	void run();
 };
 
@@ -187,7 +202,7 @@
 
 public:
 	RedoAction(FBReader &fbreader);
-	bool isEnabled();
+	bool isEnabled() const;
 	void run();
 };
 
@@ -195,7 +210,13 @@
 
 public:
 	SearchAction(FBReader &fbreader);
-	bool isVisible();
+	bool isVisible() const;
+};
+
+class SearchPatternAction : public SearchAction {
+
+public:
+	SearchPatternAction(FBReader &fbreader);
 	void run();
 
 private:
@@ -208,19 +229,19 @@
 friend class SearchPatternEntry;
 };
 
-class FindNextAction : public FBAction {
+class FindNextAction : public SearchAction {
 
 public:
 	FindNextAction(FBReader &fbreader);
-	bool isEnabled();
+	bool isEnabled() const;
 	void run();
 };
 
-class FindPreviousAction : public FBAction {
+class FindPreviousAction : public SearchAction {
 
 public:
 	FindPreviousAction(FBReader &fbreader);
-	bool isEnabled();
+	bool isEnabled() const;
 	void run();
 };
 
@@ -228,6 +249,7 @@
 
 public:
 	ChangeFontSizeAction(FBReader &fbreader, int delta);
+	bool isEnabled() const;
 	void run();
 
 private:
@@ -245,6 +267,7 @@
 
 public:
 	ToggleIndicatorAction(FBReader &fbreader);
+	bool isVisible() const;
 	void run();
 };
 
@@ -259,7 +282,7 @@
 
 public:
 	OpenPreviousBookAction(FBReader &fbreader);
-	bool isVisible();
+	bool isVisible() const;
 	void run();
 };
 
@@ -267,8 +290,8 @@
 
 public:
 	GotoNextTOCSectionAction(FBReader &fbreader);
-	bool isVisible();
-	bool isEnabled();
+	bool isVisible() const;
+	bool isEnabled() const;
 	void run();
 };
 
@@ -276,35 +299,40 @@
 
 public:
 	GotoPreviousTOCSectionAction(FBReader &fbreader);
-	bool isVisible();
-	bool isEnabled();
+	bool isVisible() const;
+	bool isEnabled() const;
 	void run();
 };
 
 class GotoPageNumber : public ModeDependentAction {
 
 public:
-	GotoPageNumber(FBReader &fbreader);
-	bool isEnabled();
+	GotoPageNumber(FBReader &fbreader, const std::string &parameter);
+	bool isVisible() const;
+	bool isEnabled() const;
 	void run();
+
+private:
+	const std::string myParameter;
 };
 
 class SelectionAction : public FBAction {
 
 public:
 	SelectionAction(FBReader &fbreader);
-	bool isVisible();
-	bool isEnabled();
+	bool isVisible() const;
+	bool isEnabled() const;
 
 protected:
 	ZLTextView &textView();
+	const ZLTextView &textView() const;
 };
 
 class CopySelectedTextAction : public SelectionAction {
 
 public:
 	CopySelectedTextAction(FBReader &fbreader);
-	bool isVisible();
+	bool isVisible() const;
 	void run();
 };
 
@@ -312,7 +340,7 @@
 
 public:
 	OpenSelectedTextInDictionaryAction(FBReader &fbreader);
-	bool isVisible();
+	bool isVisible() const;
 	void run();
 };
 
@@ -323,8 +351,43 @@
 	void run();
 };
 
+class SearchOnNetworkAction : public ModeDependentAction {
+
+public:
+	SearchOnNetworkAction(FBReader &fbreader);
+	void run();
+};
+
+class AdvancedSearchOnNetworkAction : public ModeDependentAction {
+
+public:
+	AdvancedSearchOnNetworkAction(FBReader &fbreader);
+	void run();
+};
+
+class FBFullscreenAction : public ZLApplication::FullscreenAction {
+
+public:
+	FBFullscreenAction(FBReader &fbreader);
+	void run();
+
+private:
+	FBReader &myFBReader;
+};
+
+class BooksOrderAction : public ModeDependentAction {
+
+public:
+	BooksOrderAction(FBReader &fbreader);
+	void run();
+};
+
 inline FBReader &FBAction::fbreader() {
 	return myFBReader;
 }
 
+inline const FBReader &FBAction::fbreader() const {
+	return myFBReader;
+}
+
 #endif /* __FBREADERACTIONS_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReader.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/FBReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,9 +36,11 @@
 #include "FootnoteView.h"
 #include "ContentsView.h"
 #include "CollectionView.h"
-#include "RecentBooksView.h"
+#include "NetLibraryView.h"
+#include "RecentBooksPopupData.h"
 #include "BookInfoDialog.h"
 #include "TimeUpdater.h"
+#include "NetworkOperationRunnable.h"
 
 #include "../migration/migrate.h"
 
@@ -62,6 +64,8 @@
 const std::string LINES_TO_SCROLL = "LinesToScroll";
 const std::string PERCENT_TO_SCROLL = "PercentToScroll";
 
+const std::string FBReader::PageIndexParameter = "pageIndex";
+
 FBReader::ScrollingOptions::ScrollingOptions(const std::string &groupName, long delayValue, long modeValue, long linesToKeepValue, long linesToScrollValue, long percentToScrollValue) :
 	DelayOption(ZLCategoryKey::CONFIG, groupName, DELAY, 0, 5000, delayValue),
 	ModeOption(ZLCategoryKey::CONFIG, groupName, MODE, modeValue),
@@ -97,32 +101,38 @@
 	TapScrollingOnFingerOnlyOption(ZLCategoryKey::CONFIG, TAP_SCROLLING, "FingerOnly", true),
 	UseSeparateBindingsOption(ZLCategoryKey::CONFIG, "KeysOptions", "UseSeparateBindings", false),
 	EnableSingleClickDictionaryOption(ZLCategoryKey::CONFIG, "Dictionary", "SingleClick", false),
-	myBindings0("Keys"),
-	myBindings90("Keys90"),
-	myBindings180("Keys180"),
-	myBindings270("Keys270"),
+	myBindings0(new ZLKeyBindings("Keys")),
+	myBindings90(new ZLKeyBindings("Keys90")),
+	myBindings180(new ZLKeyBindings("Keys180")),
+	myBindings270(new ZLKeyBindings("Keys270")),
 	myBookToOpen(bookToOpen),
-	myBookAlreadyOpen(false) {
+	myBookAlreadyOpen(false),
+	myActionOnCancel(UNFULLSCREEN) {
 
 	myModel = 0;
 	myBookTextView = new BookTextView(*this, context());
 	myFootnoteView = new FootnoteView(*this, context());
 	myContentsView = new ContentsView(*this, context());
 	myCollectionView = new CollectionView(*this, context());
-	myRecentBooksView = new RecentBooksView(*this, context());
+	myNetLibraryView = new NetLibraryView(*this, context());
+	myRecentBooksPopupData = new RecentBooksPopupData(*this);
 	myMode = UNDEFINED_MODE;
 	myPreviousMode = BOOK_TEXT_MODE;
 	setMode(BOOK_TEXT_MODE);
 
-	addAction(ActionCode::SHOW_COLLECTION, new SetModeAction(*this, FBReader::BOOK_COLLECTION_MODE, FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE | FBReader::RECENT_BOOKS_MODE));
-	addAction(ActionCode::SHOW_LAST_BOOKS, new SetModeAction(*this, FBReader::RECENT_BOOKS_MODE, FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE));
+	addAction(ActionCode::SHOW_READING, new UndoAction(*this, FBReader::ALL_MODES & ~FBReader::BOOK_TEXT_MODE));
+	addAction(ActionCode::SHOW_COLLECTION, new SetModeAction(*this, FBReader::BOOK_COLLECTION_MODE, FBReader::BOOK_TEXT_MODE | FBReader::CONTENTS_MODE));
+	addAction(ActionCode::SHOW_NET_LIBRARY, new ShowNetworkLibraryAction(*this));
+	addAction(ActionCode::SEARCH_ON_NETWORK, new SearchOnNetworkAction(*this));
+	addAction(ActionCode::ADVANCED_SEARCH_ON_NETWORK, new AdvancedSearchOnNetworkAction(*this));
+	registerPopupData(ActionCode::SHOW_COLLECTION, myRecentBooksPopupData);
 	addAction(ActionCode::SHOW_OPTIONS, new ShowOptionsDialogAction(*this));
 	addAction(ActionCode::SHOW_CONTENTS, new ShowContentsAction(*this));
 	addAction(ActionCode::SHOW_BOOK_INFO, new ShowBookInfoAction(*this));
-	addAction(ActionCode::ADD_BOOK, new AddBookAction(*this));
-	addAction(ActionCode::UNDO, new UndoAction(*this));
+	addAction(ActionCode::ADD_BOOK, new AddBookAction(*this, FBReader::BOOK_TEXT_MODE | FBReader::BOOK_COLLECTION_MODE | FBReader::CONTENTS_MODE));
+	addAction(ActionCode::UNDO, new UndoAction(*this, FBReader::BOOK_TEXT_MODE));
 	addAction(ActionCode::REDO, new RedoAction(*this));
-	addAction(ActionCode::SEARCH, new SearchAction(*this));
+	addAction(ActionCode::SEARCH, new SearchPatternAction(*this));
 	addAction(ActionCode::FIND_NEXT, new FindNextAction(*this));
 	addAction(ActionCode::FIND_PREVIOUS, new FindPreviousAction(*this));
 	addAction(ActionCode::SCROLL_TO_HOME, new ScrollToHomeAction(*this));
@@ -139,8 +149,8 @@
 	addAction(ActionCode::INCREASE_FONT, new ChangeFontSizeAction(*this, 2));
 	addAction(ActionCode::DECREASE_FONT, new ChangeFontSizeAction(*this, -2));
 	addAction(ActionCode::ROTATE_SCREEN, new RotationAction(*this));
-	addAction(ActionCode::TOGGLE_FULLSCREEN, new FullscreenAction(*this, true));
-	addAction(ActionCode::FULLSCREEN_ON, new FullscreenAction(*this, false));
+	addAction(ActionCode::TOGGLE_FULLSCREEN, new FBFullscreenAction(*this));
+	addAction(ActionCode::FULLSCREEN_ON, new FBFullscreenAction(*this));
 	addAction(ActionCode::CANCEL, new CancelAction(*this));
 	addAction(ActionCode::SHOW_HIDE_POSITION_INDICATOR, new ToggleIndicatorAction(*this));
 	addAction(ActionCode::QUIT, new QuitAction(*this));
@@ -151,7 +161,11 @@
 	addAction(ActionCode::COPY_SELECTED_TEXT_TO_CLIPBOARD, new CopySelectedTextAction(*this));
 	addAction(ActionCode::OPEN_SELECTED_TEXT_IN_DICTIONARY, new OpenSelectedTextInDictionaryAction(*this));
 	addAction(ActionCode::CLEAR_SELECTION, new ClearSelectionAction(*this));
-	addAction(ActionCode::GOTO_PAGE_NUMBER, new GotoPageNumber(*this));
+	addAction(ActionCode::GOTO_PAGE_NUMBER, new GotoPageNumber(*this, std::string()));
+	addAction(ActionCode::GOTO_PAGE_NUMBER_WITH_PARAMETER, new GotoPageNumber(*this, PageIndexParameter));
+	shared_ptr<Action> booksOrderAction = new BooksOrderAction(*this);
+	addAction(ActionCode::ORGANIZE_BOOKS_BY_AUTHOR, booksOrderAction);
+	addAction(ActionCode::ORGANIZE_BOOKS_BY_TAG, booksOrderAction);
 
 	myOpenFileHandler = new OpenFileHandler(*this);
 	ZLCommunicationManager::instance().registerHandler("openFile", myOpenFileHandler);
@@ -200,11 +214,8 @@
 bool FBReader::createDescription(const std::string& fileName, BookDescriptionPtr &description) {
 	ZLFile bookFile = ZLFile(fileName);
 
-	if (!bookFile.isArchive()) {
-		FormatPlugin *plugin = PluginCollection::instance().plugin(ZLFile(fileName), false);
-		if (plugin == 0) {
-			return false;
-		}
+	FormatPlugin *plugin = PluginCollection::instance().plugin(ZLFile(fileName), false);
+	if (plugin != 0) {
 		std::string error = plugin->tryOpen(fileName);
 		if (!error.empty()) {
 			ZLResourceKey boxKey("openBookErrorBox");
@@ -219,6 +230,10 @@
 		return true;
 	}
 
+	if (!bookFile.isArchive()) {
+		return false;
+	}
+
 	std::queue<std::string> archiveNames;
 	archiveNames.push(bookFile.path());
 
@@ -268,32 +283,33 @@
 		BookTextView &bookTextView = (BookTextView&)*myBookTextView;
 		ContentsView &contentsView = (ContentsView&)*myContentsView;
 		FootnoteView &footnoteView = (FootnoteView&)*myFootnoteView;
-		RecentBooksView &recentBooksView = (RecentBooksView&)*myRecentBooksView;
 
 		bookTextView.saveState();
-		bookTextView.setModel(0, "");
+		bookTextView.setModel(0, "", "");
 		bookTextView.setContentsModel(0);
-		contentsView.setModel(0);
+		contentsView.setModel(0, "");
 		if (myModel != 0) {
 			delete myModel;
 		}
 		myModel = new BookModel(description);
 		ZLStringOption(ZLCategoryKey::STATE, STATE, BOOK, std::string()).setValue(myModel->fileName());
-		ZLTextHyphenator::instance().load(description->language());
-		bookTextView.setModel(myModel->bookTextModel(), description->fileName());
+		const std::string &lang = description->language();
+		ZLTextHyphenator::instance().load(lang);
+		bookTextView.setModel(myModel->bookTextModel(), lang, description->fileName());
 		bookTextView.setCaption(description->title());
 		bookTextView.setContentsModel(myModel->contentsModel());
-		footnoteView.setModel(0);
+		footnoteView.setModel(0, lang);
 		footnoteView.setCaption(description->title());
-		contentsView.setModel(myModel->contentsModel());
+		contentsView.setModel(myModel->contentsModel(), lang);
 		contentsView.setCaption(description->title());
 
-		recentBooksView.lastBooks().addBook(description->fileName());
+		myRecentBooks.addBook(description);
+		((RecentBooksPopupData&)*myRecentBooksPopupData).updateId();
 	}
 }
 
-void FBReader::tryShowFootnoteView(const std::string &id, bool external) {
-	if (external) {
+void FBReader::tryShowFootnoteView(const std::string &id, const std::string &type) {
+	if (type == "external") {
 		shared_ptr<ProgramCollection> collection = webBrowserCollection();
 		if (!collection.isNull()) {
 			shared_ptr<Program> program = collection->currentProgram();
@@ -301,7 +317,7 @@
 				program->run("openLink", id);
 			}
 		}
-	} else {
+	} else if (type == "internal") {
 		if ((myMode == BOOK_TEXT_MODE) && (myModel != 0)) {
 			BookModel::Label label = myModel->label(id);
 			if (!label.Model.isNull()) {
@@ -309,7 +325,7 @@
 					bookTextView().gotoParagraph(label.ParagraphNumber);
 				} else {
 					FootnoteView &view = ((FootnoteView&)*myFootnoteView);
-					view.setModel(label.Model);
+					view.setModel(label.Model, myModel->description()->language());
 					setMode(FOOTNOTE_MODE);
 					view.gotoParagraph(label.ParagraphNumber);
 				}
@@ -317,27 +333,23 @@
 				refreshWindow();
 			}
 		}
+	} else if (type == "book") {
+		DownloadBookRunnable downloader(id);
+		downloader.executeWithUI();
+		if (downloader.hasErrors()) {
+			downloader.showErrorMessage();
+		} else {
+			openFile(downloader.fileName());
+		}
 	}
 }
 
-class RebuildCollectionRunnable : public ZLRunnable {
-
-public:
-	RebuildCollectionRunnable(FBReader &reader) : myReader(reader) {}
-	void run() { myReader.rebuildCollectionInternal(); }
-
-private:
-	FBReader &myReader;
-};
-
-void FBReader::rebuildCollectionInternal() {
-	CollectionView &collectionView = (CollectionView&)*myCollectionView;
-	collectionView.updateModel();
-	collectionView.collection().authors();
+FBReader::ViewMode FBReader::mode() const {
+	return myMode;
 }
 
-FBReader::ViewMode FBReader::getMode() const {
-	return myMode;
+bool FBReader::isViewFinal() const {
+	return myMode == BOOK_TEXT_MODE;
 }
 
 void FBReader::setMode(ViewMode mode) {
@@ -345,13 +357,17 @@
 		return;
 	}
 
+	if (mode != BOOK_TEXT_MODE) {
+		myActionOnCancel = RETURN_TO_TEXT_MODE;
+	}
+
 	myPreviousMode = myMode;
 	myMode = mode;
 
-	setViewFinal(myMode == BOOK_TEXT_MODE);
-
 	switch (myMode) {
 		case BOOK_TEXT_MODE:
+			setHyperlinkCursor(false);
+			((ZLTextView&)*myBookTextView).forceScrollbarUpdate();
 			setView(myBookTextView);
 			break;
 		case CONTENTS_MODE:
@@ -362,22 +378,16 @@
 			setView(myFootnoteView);
 			break;
 		case BOOK_COLLECTION_MODE:
-			{
-				RebuildCollectionRunnable runnable(*this);
-				ZLDialogManager::instance().wait(ZLResourceKey("loadingBookList"), runnable);
-			}
-			if (myModel != 0) {
-				((CollectionView&)*myCollectionView).selectBook(myModel->description());
-			}
+			collectionView().openWithBook((myModel != 0) ? myModel->description() : 0);
 			setView(myCollectionView);
 			break;
-		case RECENT_BOOKS_MODE:
-			((RecentBooksView&)*myRecentBooksView).rebuild();
-			setView(myRecentBooksView);
-			break;
 		case BOOKMARKS_MODE:
 			break;
+		case NET_LIBRARY_MODE:
+			setView(myNetLibraryView);
+			break;
 		case UNDEFINED_MODE:
+		case ALL_MODES:
 			break;
 	}
 }
@@ -436,26 +446,26 @@
 	((ZLTextView&)*myFootnoteView).clearCaches();
 	((ZLTextView&)*myContentsView).clearCaches();
 	((ZLTextView&)*myCollectionView).clearCaches();
-	((ZLTextView&)*myRecentBooksView).clearCaches();
+	((ZLTextView&)*myNetLibraryView).clearCaches();
 }
 
-ZLKeyBindings &FBReader::keyBindings() {
+shared_ptr<ZLKeyBindings> FBReader::keyBindings() {
 	return UseSeparateBindingsOption.value() ?
-		keyBindings(myViewWidget->rotation()) : myBindings0;
+		keyBindings(rotation()) : myBindings0;
 }
 
-ZLKeyBindings &FBReader::keyBindings(ZLViewWidget::Angle angle) {
+shared_ptr<ZLKeyBindings> FBReader::keyBindings(ZLView::Angle angle) {
 	switch (angle) {
-		case ZLViewWidget::DEGREES0:
-		default:
+		case ZLView::DEGREES0:
 			return myBindings0;
-		case ZLViewWidget::DEGREES90:
+		case ZLView::DEGREES90:
 			return myBindings90;
-		case ZLViewWidget::DEGREES180:
+		case ZLView::DEGREES180:
 			return myBindings180;
-		case ZLViewWidget::DEGREES270:
+		case ZLView::DEGREES270:
 			return myBindings270;
 	}
+	return 0;
 }
 
 shared_ptr<ProgramCollection> FBReader::dictionaryCollection() const {
@@ -476,3 +486,11 @@
 shared_ptr<ProgramCollection> FBReader::webBrowserCollection() const {
 	return myProgramCollectionMap.collection("Web Browser");
 }
+
+RecentBooks &FBReader::recentBooks() {
+	return myRecentBooks;
+}
+
+const RecentBooks &FBReader::recentBooks() const {
+	return myRecentBooks;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReader.h
--- fbreader-0.8.17/fbreader/src/fbreader/FBReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #include <ZLApplication.h>
 #include <ZLKeyBindings.h>
 
+#include "../collection/BookCollection.h"
 #include "../description/BookDescription.h"
 #include "../external/ProgramCollection.h"
 
@@ -37,10 +38,7 @@
 
 class BookModel;
 class BookTextView;
-class FootnoteView;
-class ContentsView;
 class CollectionView;
-class RecentBooksView;
 
 class FBReader : public ZLApplication {
 
@@ -48,6 +46,8 @@
 	// returns true if description was found or error message was shown
 	static bool createDescription(const std::string &fileName, BookDescriptionPtr &description);
 
+	static const std::string PageIndexParameter;
+
 public:
 	enum ViewMode {
 		UNDEFINED_MODE = 0,
@@ -56,7 +56,8 @@
 		CONTENTS_MODE = 1 << 2,
 		BOOKMARKS_MODE = 1 << 3,
 		BOOK_COLLECTION_MODE = 1 << 4,
-		RECENT_BOOKS_MODE = 1 << 5,
+		NET_LIBRARY_MODE = 1 << 5,
+		ALL_MODES = 0x3F
 	};
 
 	struct ScrollingOptions {
@@ -88,7 +89,7 @@
 	~FBReader();
 
 	void setMode(ViewMode mode);
-	ViewMode getMode() const;
+	ViewMode mode() const;
 
 private:
 	void initWindow();
@@ -103,21 +104,26 @@
 	std::string helpFileName(const std::string &language) const;
 	void openFile(const std::string &fileName);
 
+	bool isViewFinal() const;
+
 public:
-	ZLKeyBindings &keyBindings();
-	ZLKeyBindings &keyBindings(ZLViewWidget::Angle angle);
+	shared_ptr<ZLKeyBindings> keyBindings();
+	shared_ptr<ZLKeyBindings> keyBindings(ZLView::Angle angle);
 
 	bool isDictionarySupported() const;
 	void openInDictionary(const std::string &word);
 
 	shared_ptr<ProgramCollection> webBrowserCollection() const;
 
-	void tryShowFootnoteView(const std::string &id, bool external);
+	void tryShowFootnoteView(const std::string &id, const std::string &type);
 	BookTextView &bookTextView() const;
 	CollectionView &collectionView() const;
 	void showBookTextView();
 	void openBook(BookDescriptionPtr description);
 
+	RecentBooks &recentBooks();
+	const RecentBooks &recentBooks() const;
+
 private:
 	shared_ptr<ProgramCollection> dictionaryCollection() const;
 
@@ -135,16 +141,17 @@
 	shared_ptr<ZLView> myBookTextView;	
 	shared_ptr<ZLView> myContentsView;	
 	shared_ptr<ZLView> myCollectionView;	
-	shared_ptr<ZLView> myRecentBooksView;	
+	shared_ptr<ZLView> myNetLibraryView;	
+	shared_ptr<ZLPopupData> myRecentBooksPopupData;	
 
 	ZLTime myLastScrollingTime;
 
 	BookModel *myModel;
 
-	ZLKeyBindings myBindings0;
-	ZLKeyBindings myBindings90;
-	ZLKeyBindings myBindings180;
-	ZLKeyBindings myBindings270;
+	shared_ptr<ZLKeyBindings> myBindings0;
+	shared_ptr<ZLKeyBindings> myBindings90;
+	shared_ptr<ZLKeyBindings> myBindings180;
+	shared_ptr<ZLKeyBindings> myBindings270;
 
 	std::string myBookToOpen;
 	bool myBookAlreadyOpen;
@@ -153,14 +160,21 @@
 
 	shared_ptr<ZLMessageHandler> myOpenFileHandler;
 
+	RecentBooks myRecentBooks;
+
+	enum {
+		RETURN_TO_TEXT_MODE,
+		UNFULLSCREEN
+	} myActionOnCancel;
+
 friend class OpenFileHandler;
 
 friend class OptionsDialog;
 friend class FBView;
+friend class NetLibraryView;
 
 //friend class ShowCollectionAction;
 friend class ShowHelpAction;
-//friend class ShowRecentBooksListAction;
 //friend class ShowOptionsDialogAction;
 friend class ShowContentsAction;
 friend class AddBookAction;
@@ -171,6 +185,7 @@
 friend class UndoAction;
 //friend class RedoAction;
 friend class SearchAction;
+friend class SearchPatternAction;
 friend class FindNextAction;
 friend class FindPreviousAction;
 friend class ScrollingAction;
@@ -183,6 +198,9 @@
 friend class GotoPreviousTOCSectionAction;
 //friend class GotoPageNumber;
 friend class SelectionAction;
+friend class SearchOnNetworkAction;
+friend class AdvancedSearchOnNetworkAction;
+friend class FBFullscreenAction;
 };
 
 #endif /* __FBREADER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBView.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/FBView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <cmath>
+
 #include <ZLUnicodeUtil.h>
 
 #include "FBView.h"
@@ -35,18 +37,18 @@
 static const std::string INDICATOR = "Indicator";
 
 FBIndicatorStyle::FBIndicatorStyle() :
-	ShowOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Show", true),
+	TypeOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Type", 0, 2, ZLTextPositionIndicatorInfo::OS_SCROLLBAR),
 	IsSensitiveOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "TouchSensitive", true),
-	ShowTextPositionOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "PositionText", true),
-	ShowTimeOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Time", true),
+	ShowTextPositionOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "PositionText", false),
+	ShowTimeOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Time", false),
 	ColorOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Color", ZLColor(127, 127, 127)),
 	HeightOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Height", 1, 100, 16),
 	OffsetOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "Offset", 0, 100, 3),
 	FontSizeOption(ZLCategoryKey::LOOK_AND_FEEL, INDICATOR, "FontSize", 4, 72, 14) {
 }
 
-bool FBIndicatorStyle::isVisible() const {
-	return ShowOption.value();
+ZLTextPositionIndicatorInfo::Type FBIndicatorStyle::type() const {
+	return (ZLTextPositionIndicatorInfo::Type)TypeOption.value();
 }
 
 bool FBIndicatorStyle::isSensitive() const {
@@ -120,6 +122,10 @@
 }
 
 bool FBView::onStylusPress(int x, int y) {
+	myPressedX = x;
+	myPressedY = y;
+	myIsReleasedWithoutMotion = true;
+
 	if (ZLTextView::onStylusPress(x, y)) {
 		return true;
 	}
@@ -128,18 +134,75 @@
 		return true;
 	}
 
-	if (fbreader().EnableTapScrollingOption.value() &&
+	return true;
+}
+
+bool FBView::_onStylusPress(int, int) {
+	return false;
+}
+
+bool FBView::onStylusRelease(int x, int y) {
+	if (ZLTextView::onStylusRelease(x, y)) {
+		return true;
+	}
+	
+	if (_onStylusRelease(x, y)) {
+		return true;
+	}
+
+	myIsReleasedWithoutMotion =
+		myIsReleasedWithoutMotion && (abs(x - pressedX()) <= 5) && (abs(y - pressedY()) <= 5);
+	if (isReleasedWithoutMotion() &&
+			fbreader().EnableTapScrollingOption.value() &&
 			(!ZLBooleanOption(ZLCategoryKey::EMPTY, ZLOption::PLATFORM_GROUP, ZLOption::FINGER_TAP_DETECTABLE, false).value() ||
 			 !fbreader().TapScrollingOnFingerOnlyOption.value())) {
 		doTapScrolling(y);
 		return true;
 	}
 
-	activateSelection(x, y);
-	return true;
+	return false;
 }
 
-bool FBView::_onStylusPress(int, int) {
+bool FBView::_onStylusRelease(int, int) {
+	return false;
+}
+
+bool FBView::onStylusMove(int x, int y) {
+	if (ZLTextView::onStylusMove(x, y)) {
+		return true;
+	}
+	
+	if (_onStylusMove(x, y)) {
+		return true;
+	}
+
+	return false;
+}
+
+bool FBView::_onStylusMove(int, int) {
+	return false;
+}
+
+bool FBView::onStylusMovePressed(int x, int y) {
+	if (myIsReleasedWithoutMotion) {
+		if ((abs(x - pressedX()) > 5) || (abs(y - pressedY()) > 5)) {
+			myIsReleasedWithoutMotion = false;
+			activateSelection(pressedX(), pressedY());
+		}
+	}
+
+	if (ZLTextView::onStylusMovePressed(x, y)) {
+		return true;
+	}
+	
+	if (_onStylusMovePressed(x, y)) {
+		return true;
+	}
+
+	return false;
+}
+
+bool FBView::_onStylusMovePressed(int, int) {
 	return false;
 }
 
@@ -148,24 +211,24 @@
 
 	if (area.Kind == ZLTextElement::WORD_ELEMENT) {
 		ZLTextWordCursor cursor = startCursor();
-		cursor.moveToParagraph(area.ParagraphNumber);
-		cursor.moveTo(area.TextElementNumber, 0);
+		cursor.moveToParagraph(area.ParagraphIndex);
+		cursor.moveTo(area.ElementIndex, 0);
 		const ZLTextWord &word = (ZLTextWord&)cursor.element();
-		ZLUnicodeUtil::Ucs2String ucs2;
-		ZLUnicodeUtil::utf8ToUcs2(ucs2, word.Data, word.Size);
-		ZLUnicodeUtil::Ucs2String::iterator it = ucs2.begin();
-		while ((it != ucs2.end()) && !ZLUnicodeUtil::isLetter(*it)) {
+		ZLUnicodeUtil::Ucs4String ucs4;
+		ZLUnicodeUtil::utf8ToUcs4(ucs4, word.Data, word.Size);
+		ZLUnicodeUtil::Ucs4String::iterator it = ucs4.begin();
+		while ((it != ucs4.end()) && !ZLUnicodeUtil::isLetter(*it)) {
 			++it;
 		}
-		if (it != ucs2.end()) {
-			ucs2.erase(ucs2.begin(), it);
-			it = ucs2.end() - 1;
+		if (it != ucs4.end()) {
+			ucs4.erase(ucs4.begin(), it);
+			it = ucs4.end() - 1;
 			while (!ZLUnicodeUtil::isLetter(*it)) {
 				--it;
 			}
-			ucs2.erase(it + 1, ucs2.end());
+			ucs4.erase(it + 1, ucs4.end());
     
-			ZLUnicodeUtil::ucs2ToUtf8(txt, ucs2);
+			ZLUnicodeUtil::ucs4ToUtf8(txt, ucs4);
 		}
 	}
 	return txt;
@@ -197,3 +260,13 @@
 bool FBView::isSelectionEnabled() const {
 	return selectionOption().value();
 }
+
+void FBView::scrollAndUpdatePage(bool forward, ScrollingMode mode, unsigned int value) {
+	scrollPage(forward, mode, value);
+	preparePaintInfo();
+	fbreader().refreshWindow();
+}
+
+bool FBView::hasContents() const {
+	return true;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FBView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FBView.h
--- fbreader-0.8.17/fbreader/src/fbreader/FBView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FBView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 class FBIndicatorStyle : public ZLTextPositionIndicatorInfo {
 
 public:
-	ZLBooleanOption ShowOption;
+	ZLIntegerRangeOption TypeOption;
 	ZLBooleanOption IsSensitiveOption;
 	ZLBooleanOption ShowTextPositionOption;
 	ZLBooleanOption ShowTimeOption;
@@ -55,7 +55,7 @@
 public:
 	FBIndicatorStyle();
 
-	bool isVisible() const;
+	Type type() const;
 	bool isSensitive() const;
 	bool isTextPositionShown() const;
 	bool isTimeShown() const;
@@ -72,6 +72,10 @@
 	static FBIndicatorStyle& commonIndicatorInfo();
 	static ZLBooleanOption &selectionOption();
 
+	void scrollAndUpdatePage(bool forward, ScrollingMode mode, unsigned int value);
+
+	virtual bool hasContents() const;
+
 private:
 	static shared_ptr<ZLTextPositionIndicatorInfo> ourIndicatorInfo;
 	static shared_ptr<FBMargins> ourMargins;
@@ -101,6 +105,16 @@
 
 	bool onStylusPress(int x, int y);
 	virtual bool _onStylusPress(int x, int y);
+	bool onStylusRelease(int x, int y);
+	virtual bool _onStylusRelease(int x, int y);
+	bool onStylusMove(int x, int y);
+	virtual bool _onStylusMove(int x, int y);
+	bool onStylusMovePressed(int x, int y);
+	virtual bool _onStylusMovePressed(int x, int y);
+
+	int pressedX() const;
+	int pressedY() const;
+	bool isReleasedWithoutMotion() const;
 
 	std::string word(const ZLTextElementArea &area) const;
 
@@ -108,6 +122,10 @@
 
 private:
 	std::string myCaption;
+
+	int myPressedX;
+	int myPressedY;
+	bool myIsReleasedWithoutMotion;
 };
 
 inline FBReader &FBView::fbreader() { return (FBReader&)application(); }
@@ -120,4 +138,8 @@
 	return *ourMargins;
 }
 
+inline int FBView::pressedX() const { return myPressedX; }
+inline int FBView::pressedY() const { return myPressedY; }
+inline bool FBView::isReleasedWithoutMotion() const { return myIsReleasedWithoutMotion; }
+
 #endif /* __FBVIEW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/FootnoteView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/FootnoteView.h
--- fbreader-0.8.17/fbreader/src/fbreader/FootnoteView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/FootnoteView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/main.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/main.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/main.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/main.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/NetLibraryView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/NetLibraryView.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/NetLibraryView.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/NetLibraryView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,331 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <algorithm>
+
+#include <ZLibrary.h>
+#include <ZLFileImage.h>
+#include <ZLFile.h>
+#include <ZLDir.h>
+#include <ZLNetworkManager.h>
+
+#include "NetLibraryView.h"
+#include "CollectionView.h"
+#include "FBReader.h"
+#include "NetworkOperationRunnable.h"
+
+#include "../bookmodel/FBTextKind.h"
+
+#include "../network/NetworkLink.h"
+
+const std::string NetLibraryView::SEARCH_PARAMETER_ID = "networkSearchPattern";
+
+const std::string NetLibraryView::DownloadMobi = "downloadMobi";
+const std::string NetLibraryView::ReadLocalMobi = "readLocalMobi";
+const std::string NetLibraryView::DownloadEpub = "downloadEpub";
+const std::string NetLibraryView::ReadLocalEpub = "readLocalEpub";
+const std::string NetLibraryView::OpenInBrowser = "openInBrowser";
+
+NetLibraryView::NetLibraryView(FBReader &reader, shared_ptr<ZLPaintContext> context) : FBView(reader, context), myResource(ZLResource::resource("networkLibrary")) {
+	const std::string prefix = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
+	myImageMap[DownloadMobi] = new ZLFileImage("image/png", prefix + "tree-download-mobi.png", 0);
+	myImageMap[ReadLocalMobi] = new ZLFileImage("image/png", prefix + "tree-local-mobi.png", 0);
+	myImageMap[DownloadEpub] = new ZLFileImage("image/png", prefix + "tree-download-epub.png", 0);
+	myImageMap[ReadLocalEpub] = new ZLFileImage("image/png", prefix + "tree-local-epub.png", 0);
+	myImageMap[OpenInBrowser] = new ZLFileImage("image/png", prefix + "tree-open-in-browser.png", 0);
+
+	ZLTextPlainModel *model = new ZLTextPlainModel(8192);
+	model->createParagraph(ZLTextParagraph::TEXT_PARAGRAPH);
+	model->addControl(LIBRARY_ENTRY, true);
+	model->addText(myResource["startText"].value());
+	setModel(model, ZLibrary::Language());
+}
+
+const std::string &NetLibraryView::caption() const {
+	return myResource["caption"].value();
+}
+
+NetLibraryView::~NetLibraryView() {
+}
+
+class SearchRunnable : public NetworkOperationRunnable {
+
+protected:
+	SearchRunnable();
+
+public:
+	const NetworkBookList &bookList() const;
+
+protected:
+	NetworkBookList myBookList;
+};
+
+SearchRunnable::SearchRunnable() : NetworkOperationRunnable("downloadBookList") {
+}
+
+const NetworkBookList &SearchRunnable::bookList() const {
+	return myBookList;
+}
+
+class SimpleSearchRunnable : public SearchRunnable {
+
+public:
+	SimpleSearchRunnable(const std::string &pattern);
+	void run();
+
+private:
+	const std::string myPattern;
+};
+
+SimpleSearchRunnable::SimpleSearchRunnable(const std::string &pattern) : myPattern(pattern) {
+}
+
+void SimpleSearchRunnable::run() {
+	myErrorMessage = NetworkLinkCollection::instance().simpleSearch(myBookList, myPattern);
+}
+
+class AdvancedSearchRunnable : public SearchRunnable {
+
+public:
+	AdvancedSearchRunnable(const std::string &title, const std::string &author, const std::string &series, const std::string &category, const std::string &description);
+	void run();
+
+private:
+	const std::string myTitle;
+	const std::string myAuthor;
+	const std::string mySeries;
+	const std::string myCategory;
+	const std::string myDescription;
+};
+
+AdvancedSearchRunnable::AdvancedSearchRunnable(const std::string &title, const std::string &author, const std::string &series, const std::string &category, const std::string &description) : myTitle(title), myAuthor(author), mySeries(series), myCategory(category), myDescription(description) {
+}
+
+void AdvancedSearchRunnable::run() {
+	myErrorMessage = NetworkLinkCollection::instance().advancedSearch(myBookList, myTitle, myAuthor, mySeries, myCategory, myDescription);
+}
+
+void NetLibraryView::addBookIcon(ZLTextTreeModel &model, const NetworkBookInfo &book, NetworkBookInfo::URLType format, const std::string &localIcon, const std::string &downloadIcon) {
+	const std::map<NetworkBookInfo::URLType,std::string>::const_iterator it = book.URLByType.find(format);
+	if (it == book.URLByType.end()) {
+		return;
+	}
+
+	const std::string &fileName = NetworkLinkCollection::instance().bookFileName(it->second);
+	const std::string &icon = (!fileName.empty() && ZLFile(fileName).exists()) ? localIcon : downloadIcon;
+	model.addFixedHSpace(1);
+	model.addImage(icon, myImageMap, 0);
+}
+
+void NetLibraryView::rebuildModel() {
+	ZLTextTreeModel *resultsModel = new ZLTextTreeModel();
+	myParagraphToBookMap.clear();
+
+	std::map<NetworkBookInfo::AuthorData,NetworkBookList> bookMap;
+	for (NetworkBookList::const_iterator it = myBookList.begin(); it != myBookList.end(); ++it) {
+		bookMap[(*it)->Author].push_back(*it);
+	}
+
+	for (std::map<NetworkBookInfo::AuthorData,NetworkBookList>::iterator jt = bookMap.begin(); jt != bookMap.end(); ++jt) {
+		ZLTextTreeParagraph *authorParagraph = resultsModel->createParagraph();
+		resultsModel->addControl(LIBRARY_ENTRY, true);
+		resultsModel->addText(jt->first.DisplayName);
+		std::sort(jt->second.begin(), jt->second.end(), NetworkBookInfo::Comparator());
+		std::string seriesName;
+		ZLTextTreeParagraph *para = authorParagraph;
+		for (NetworkBookList::const_iterator kt = jt->second.begin(); kt != jt->second.end(); ++kt) {
+			const NetworkBookInfo &book = **kt;
+			if (book.Series.empty()) {
+				para = authorParagraph;
+			} else if (book.Series != seriesName) {
+				para = resultsModel->createParagraph(authorParagraph);
+				resultsModel->addControl(LIBRARY_ENTRY, true);
+				resultsModel->addText(book.Series);
+			}
+			myParagraphToBookMap[resultsModel->paragraphsNumber()] = *kt;
+			seriesName = book.Series;
+			ZLTextTreeParagraph *bookPara = resultsModel->createParagraph(para);
+			resultsModel->addControl(LIBRARY_ENTRY, true);
+			resultsModel->addText(book.Title);
+			addBookIcon(*resultsModel, book, NetworkBookInfo::BOOK_EPUB, ReadLocalEpub, DownloadEpub);
+			addBookIcon(*resultsModel, book, NetworkBookInfo::BOOK_MOBIPOCKET, ReadLocalMobi, DownloadMobi);
+			if (book.URLByType.find(NetworkBookInfo::LINK_HTTP) != book.URLByType.end()) {
+				resultsModel->addFixedHSpace(1);
+				resultsModel->addImage(OpenInBrowser, myImageMap, 0);
+			}
+			if (book.Annotation.length() > 6) {
+				resultsModel->createParagraph(bookPara);
+				//resultsModel->addControl(LIBRARY_ENTRY, true);
+				int start = 0;
+				int end;
+				while ((end = book.Annotation.find('<', start)) >= 0) {
+					resultsModel->addText(book.Annotation.substr(start, end - start));
+					start = book.Annotation.find('>', end);
+					if (start >= 0) {
+						++start;
+						resultsModel->addText(" ");
+					}
+				}
+				if (start >= 0) {
+					resultsModel->addText(book.Annotation.substr(start));
+				}
+			}
+		}
+	}
+	setModel(resultsModel, ZLibrary::Language());
+}
+
+void NetLibraryView::search(SearchRunnable &runnable) {
+	if (!ZLNetworkManager::instance().connect()) {
+		NetworkOperationRunnable::showErrorMessage(
+			ZLResource::resource("dialog")
+				["networkError"]
+				["couldntConnectToNetworkMessage"].value()
+		);
+		return;
+	}
+
+	runnable.executeWithUI();
+
+	runnable.showErrorMessage();
+
+	const NetworkBookList &bookList = runnable.bookList();
+	if (!bookList.empty()) {
+		myBookList = bookList;
+		rebuildModel();
+	} else if (myBookList.empty()) {
+		ZLTextPlainModel *resultsModel = new ZLTextPlainModel(8192);
+		resultsModel->createParagraph(ZLTextParagraph::TEXT_PARAGRAPH);
+		resultsModel->addControl(LIBRARY_ENTRY, true);
+		resultsModel->addText(myResource["notFound"].value());
+		setModel(resultsModel, ZLibrary::Language());
+	}
+}
+
+void NetLibraryView::search(const std::string &title, const std::string &author, const std::string &series, const std::string &category, const std::string &description) {
+	AdvancedSearchRunnable runnable(title, author, series, category, description);
+	search(runnable);
+}
+
+void NetLibraryView::search() {
+	const std::string pattern = fbreader().visualParameter(NetLibraryView::SEARCH_PARAMETER_ID);
+
+	if (pattern.empty()) {
+		return;
+	}
+
+	SimpleSearchRunnable runnable(pattern);
+	search(runnable);
+}
+
+bool NetLibraryView::_onStylusPress(int x, int y) {
+	fbreader().setHyperlinkCursor(false);
+
+	if (model().isNull()) {
+		return false;
+	}
+
+	const ZLTextElementArea *imageArea = elementByCoordinates(x, y);
+	if ((imageArea == 0) || (imageArea->Kind != ZLTextElement::IMAGE_ELEMENT)) {
+		return false;
+	}
+
+	ZLTextWordCursor cursor = startCursor();
+	cursor.moveToParagraph(imageArea->ParagraphIndex);
+	cursor.moveTo(imageArea->ElementIndex, 0);
+	const ZLTextElement &element = cursor.element();
+	if (element.kind() != ZLTextElement::IMAGE_ELEMENT) {
+		return false;
+	}
+	const ZLTextImageElement &imageElement = (ZLTextImageElement&)element;
+
+	const std::string &id = imageElement.id();
+
+	shared_ptr<NetworkBookInfo> book = myParagraphToBookMap[imageArea->ParagraphIndex];
+	if (book.isNull()) {
+		return false;
+	}
+
+	if ((id == DownloadEpub) || (id == DownloadMobi)) {
+		if (!ZLNetworkManager::instance().connect()) {
+			NetworkOperationRunnable::showErrorMessage(
+				ZLResource::resource("dialog")
+					["networkError"]
+					["couldntConnectToNetworkMessage"].value()
+			);
+			return false;
+		}
+
+		NetworkBookInfo::URLType format = (id == DownloadEpub) ? NetworkBookInfo::BOOK_EPUB : NetworkBookInfo::BOOK_MOBIPOCKET;
+		DownloadBookRunnable downloader(*book, format);
+		downloader.executeWithUI();
+		if (downloader.hasErrors()) {
+			downloader.showErrorMessage();
+		} else {
+			BookDescriptionPtr description = BookDescription::getDescription(downloader.fileName());
+			WritableBookDescription wDescription(*description);
+			wDescription.clearAuthor();
+			wDescription.addAuthor(book->Author.DisplayName, book->Author.SortKey);
+			wDescription.title() = book->Title;
+			wDescription.language() = book->Language;
+			for (std::vector<std::string>::const_iterator it = book->Tags.begin(); it != book->Tags.end(); ++it) {
+				wDescription.addTag(*it);
+			}
+			wDescription.saveInfo();
+
+			fbreader().openBook(description);
+			fbreader().setMode(FBReader::BOOK_TEXT_MODE);
+			rebuildModel();
+		}
+		return true;
+	} else if ((id == ReadLocalEpub) || (id == ReadLocalMobi)) {
+		NetworkBookInfo::URLType format = (id == DownloadEpub) ? NetworkBookInfo::BOOK_EPUB : NetworkBookInfo::BOOK_MOBIPOCKET;
+		fbreader().openFile(NetworkLinkCollection::instance().bookFileName(book->URLByType[format]));
+		fbreader().setMode(FBReader::BOOK_TEXT_MODE);
+		return true;
+	} else if (id == OpenInBrowser) {
+		std::string url = book->URLByType[NetworkBookInfo::LINK_HTTP];
+		shared_ptr<ProgramCollection> collection = fbreader().webBrowserCollection();
+		if (!url.empty() && !collection.isNull()) {
+			shared_ptr<Program> program = collection->currentProgram();
+			if (!program.isNull()) {
+				program->run("openLink", url);
+			}
+		}
+		return true;
+	}
+	return false;
+}
+
+bool NetLibraryView::_onStylusMove(int x, int y) {
+	if (!model().isNull()) {
+		const ZLTextElementArea *imageArea = elementByCoordinates(x, y);
+		if ((imageArea != 0) && (imageArea->Kind == ZLTextElement::IMAGE_ELEMENT)) {
+			fbreader().setHyperlinkCursor(true);
+			return true;
+		}
+	}
+
+	fbreader().setHyperlinkCursor(false);
+	return false;
+}
+
+bool NetLibraryView::hasContents() const {
+	return !myBookList.empty();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/NetLibraryView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/NetLibraryView.h
--- fbreader-0.8.17/fbreader/src/fbreader/NetLibraryView.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/NetLibraryView.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __NETLIBRARYVIEW_H__
+#define __NETLIBRARYVIEW_H__
+
+#include <ZLResource.h>
+
+#include "FBView.h"
+
+#include "../network/NetworkBookInfo.h"
+
+class SearchRunnable;
+
+class NetLibraryView : public FBView {
+
+private:
+	static const std::string SEARCH_PARAMETER_ID;
+	static const std::string DownloadMobi;
+	static const std::string ReadLocalMobi;
+	static const std::string DownloadEpub;
+	static const std::string ReadLocalEpub;
+	static const std::string OpenInBrowser;
+
+public:
+	NetLibraryView(FBReader &reader, shared_ptr<ZLPaintContext> context);
+	~NetLibraryView();
+	const std::string &caption() const;
+
+	void search();
+	void search(const std::string &title, const std::string &author, const std::string &series, const std::string &category, const std::string &description);
+
+private:
+	bool hasContents() const;
+
+	bool _onStylusPress(int x, int y);
+	bool _onStylusMove(int x, int y);
+
+	void search(SearchRunnable &runnable);
+
+	void addBookIcon(ZLTextTreeModel &model, const NetworkBookInfo &book, NetworkBookInfo::URLType format, const std::string &localIcon, const std::string &downloadIcon);
+	void rebuildModel();
+
+private:
+	const ZLResource &myResource;
+	ZLImageMap myImageMap;
+	NetworkBookList myBookList;
+	std::map<int,shared_ptr<NetworkBookInfo> > myParagraphToBookMap;
+};
+
+#endif /* __NETLIBRARYVIEW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/NetworkOperationRunnable.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/NetworkOperationRunnable.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/NetworkOperationRunnable.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/NetworkOperationRunnable.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLDialogManager.h>
+
+#include "NetworkOperationRunnable.h"
+#include "../network/NetworkLink.h"
+
+NetworkOperationRunnable::NetworkOperationRunnable(const std::string &uiMessageKey) : myUiMessageKey(uiMessageKey) {
+}
+
+void NetworkOperationRunnable::executeWithUI() {
+	ZLDialogManager::instance().wait(ZLResourceKey(myUiMessageKey), *this);
+}
+
+bool NetworkOperationRunnable::hasErrors() const {
+	return !myErrorMessage.empty();
+}
+
+void NetworkOperationRunnable::showErrorMessage(const std::string &message) {
+	ZLDialogManager::instance().errorBox(
+		ZLResourceKey("networkError"),
+		message
+	);
+}
+
+void NetworkOperationRunnable::showErrorMessage() const {
+	if (!myErrorMessage.empty()) {
+		showErrorMessage(myErrorMessage);
+	}
+}
+
+DownloadBookRunnable::DownloadBookRunnable(const NetworkBookInfo &book, NetworkBookInfo::URLType format) : NetworkOperationRunnable("downloadBook") {
+	const std::map<NetworkBookInfo::URLType,std::string>::const_iterator it = book.URLByType.find(format);
+	if (it != book.URLByType.end()) {
+		myURL = it->second;
+		myFileName = book.fileName(format);
+	}
+}
+
+DownloadBookRunnable::DownloadBookRunnable(const std::string &url) : NetworkOperationRunnable("downloadBook"), myURL(url) {
+}
+
+void DownloadBookRunnable::run() {
+	myErrorMessage = NetworkLinkCollection::instance().downloadBook(myURL, myFileName);
+}
+
+const std::string &DownloadBookRunnable::fileName() const {
+	return myFileName;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/NetworkOperationRunnable.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/NetworkOperationRunnable.h
--- fbreader-0.8.17/fbreader/src/fbreader/NetworkOperationRunnable.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/NetworkOperationRunnable.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __NETWORKOPERATIONRUNNABLE_H__
+#define __NETWORKOPERATIONRUNNABLE_H__
+
+#include <string>
+
+#include <ZLRunnable.h>
+
+#include "../network/NetworkBookInfo.h"
+
+class NetworkOperationRunnable : public ZLRunnable {
+
+public:
+	static void showErrorMessage(const std::string &message);
+
+protected:
+	NetworkOperationRunnable(const std::string &uiMessageKey);
+
+public:
+	void executeWithUI();
+	bool hasErrors() const;
+	void showErrorMessage() const;
+
+protected:
+	std::string myErrorMessage;
+
+private:
+	const std::string myUiMessageKey;
+};
+
+class DownloadBookRunnable : public NetworkOperationRunnable {
+
+public:
+	DownloadBookRunnable(const NetworkBookInfo &book, NetworkBookInfo::URLType format);
+	DownloadBookRunnable(const std::string &url);
+	void run();
+
+	const std::string &fileName() const;
+
+private:
+	std::string myURL;
+	std::string myFileName;
+};
+
+#endif /* __NETWORKOPERATIONRUNNABLE_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/RecentBooksPopupData.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksPopupData.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/RecentBooksPopupData.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksPopupData.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "RecentBooksPopupData.h"
+#include "FBReader.h"
+
+RecentBooksPopupData::RecentBooksPopupData(FBReader &fbreader) : myFBReader(fbreader), myId(0) {
+}
+
+void RecentBooksPopupData::updateId() {
+	++myId;
+}
+
+size_t RecentBooksPopupData::id() const {
+	return myId;
+}
+
+size_t RecentBooksPopupData::count() const {
+	return myFBReader.recentBooks().books().size();
+}
+
+const std::string RecentBooksPopupData::text(size_t index) {
+	Books books = myFBReader.recentBooks().books();
+	if (index >= books.size()) {
+		return "";
+	}
+	const BookDescription &book = *books[index];
+	return book.author()->displayName() + ". " + book.title();
+}
+
+void RecentBooksPopupData::run(size_t index) {
+	Books books = myFBReader.recentBooks().books();
+	if (index >= books.size()) {
+		return;
+	}
+	myFBReader.openBook(books[index]);
+	myFBReader.showBookTextView();
+	myFBReader.refreshWindow();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/RecentBooksPopupData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksPopupData.h
--- fbreader-0.8.17/fbreader/src/fbreader/RecentBooksPopupData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksPopupData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __RECENTBOOKSPOPUPDATA_H__
+#define __RECENTBOOKSPOPUPDATA_H__
+
+#include <ZLPopupData.h>
+
+class FBReader;
+
+class RecentBooksPopupData : public ZLPopupData {
+
+public:
+	RecentBooksPopupData(FBReader &fbreader);
+	void updateId();
+
+private:
+	size_t id() const;
+	size_t count() const;
+	const std::string text(size_t index);
+	void run(size_t index);
+
+private:
+	FBReader &myFBReader;
+	size_t myId;
+};
+
+#endif /* __RECENTBOOKSPOPUPDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/RecentBooksView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksView.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/RecentBooksView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksView.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <ZLTextModel.h>
-#include <ZLTextParagraph.h>
-
-#include "RecentBooksView.h"
-#include "FBReader.h"
-
-#include "../bookmodel/FBTextKind.h"
-#include "../description/Author.h"
-
-RecentBooksView::RecentBooksView(FBReader &reader, shared_ptr<ZLPaintContext> context) : FBView(reader, context) {
-}
-
-RecentBooksView::~RecentBooksView() {
-	rebuild();
-}
-
-const std::string &RecentBooksView::caption() const {
-	static const std::string LIBRARY = "Recent Books";
-	return LIBRARY;
-}
-
-void RecentBooksView::paint() {
-	if (model().isNull()) {
-		ZLTextPlainModel *recentBooksModel = new ZLTextPlainModel(8192);
-		const Books &books = myLastBooks.books();
-		for (Books::const_iterator it = books.begin(); it != books.end(); ++it) {
-			recentBooksModel->createParagraph(ZLTextParagraph::TEXT_PARAGRAPH);
-			recentBooksModel->addControl(RECENT_BOOK_LIST, true);
-			recentBooksModel->addControl(LIBRARY_AUTHOR_ENTRY, true);
-			recentBooksModel->addText((*it)->author()->displayName() + ". ");
-			recentBooksModel->addControl(LIBRARY_AUTHOR_ENTRY, false);
-			recentBooksModel->addControl(LIBRARY_BOOK_ENTRY, true);
-			recentBooksModel->addText((*it)->title());
-		}
-		setModel(recentBooksModel);
-	}
-	FBView::paint();
-}
-
-void RecentBooksView::rebuild() {
-	setModel(0);
-}
-
-bool RecentBooksView::_onStylusPress(int x, int y) {
-	const Books &books = myLastBooks.books();
-
-	int index = paragraphIndexByCoordinate(y);
-	if ((index == -1) || (index >= (int)books.size())) {
-		return false;
-	}
-
-	fbreader().openBook(books[index]);
-	fbreader().showBookTextView();
-	return true;
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/RecentBooksView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksView.h
--- fbreader-0.8.17/fbreader/src/fbreader/RecentBooksView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/RecentBooksView.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __RECENTBOOKSVIEW_H__
-#define __RECENTBOOKSVIEW_H__
-
-#include <map>
-
-#include "FBView.h"
-#include "../description/BookDescription.h"
-#include "../collection/BookCollection.h"
-
-class PlainTextModel;
-class Paragraph;
-
-class RecentBooksView : public FBView {
-
-public:
-	RecentBooksView(FBReader &reader, shared_ptr<ZLPaintContext> context);
-	~RecentBooksView();
-	const std::string &caption() const;
-
-	void rebuild();
-	bool _onStylusPress(int x, int y);
-
-	void paint();
-
-	LastOpenedBooks &lastBooks();
-
-private:
-	LastOpenedBooks myLastBooks;
-};
-
-inline LastOpenedBooks &RecentBooksView::lastBooks() {
-	return myLastBooks;
-}
-
-#endif /* __RECENTBOOKSVIEW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/SearchActions.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/SearchActions.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/SearchActions.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/SearchActions.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,12 @@
 #include <ZLDialogManager.h>
 #include <ZLDialog.h>
 #include <ZLStringUtil.h>
+#include <ZLOptionEntry.h>
 
 #include <ZLTextView.h>
 
 #include "FBReader.h"
+#include "FBView.h"
 #include "FBReaderActions.h"
 #include "../options/FBOptions.h"
 
@@ -35,18 +37,18 @@
 class SearchPatternEntry : public ZLComboOptionEntry {
 
 public:
-	SearchPatternEntry(SearchAction &action);
+	SearchPatternEntry(SearchPatternAction &action);
 
 	const std::string &initialValue() const;
 	const std::vector<std::string> &values() const;
 	void onAccept(const std::string &value);
 
 private:
-	SearchAction &myAction;
+	SearchPatternAction &myAction;
 	mutable std::vector<std::string> myValues;
 };
 
-SearchPatternEntry::SearchPatternEntry(SearchAction &action) : ZLComboOptionEntry(true), myAction(action) {
+SearchPatternEntry::SearchPatternEntry(SearchPatternAction &action) : ZLComboOptionEntry(true), myAction(action) {
 }
 
 const std::string &SearchPatternEntry::initialValue() const {
@@ -72,7 +74,7 @@
 void SearchPatternEntry::onAccept(const std::string &value) {
 	std::string v = value;
 	ZLStringUtil::stripWhiteSpaces(v);
-	if (!v.empty() && (v != values()[0])) {
+	if (v != values()[0]) {
 		myAction.SearchPatternOption.setValue(v);
 		int index = 1;
 		for (std::vector<std::string>::const_iterator it = myValues.begin(); (index < 6) && (it != myValues.end()); ++it) {
@@ -85,7 +87,15 @@
 	}
 }
 
-SearchAction::SearchAction(FBReader &fbreader) : FBAction(fbreader),
+SearchAction::SearchAction(FBReader &fbreader) : FBAction(fbreader) {
+}
+
+bool SearchAction::isVisible() const {
+	shared_ptr<ZLView> view = fbreader().currentView();
+	return !view.isNull() && ((FBView&)*view).hasContents();
+}
+
+SearchPatternAction::SearchPatternAction(FBReader &fbreader) : SearchAction(fbreader),
 	SearchBackwardOption(FBCategoryKey::SEARCH, SEARCH, "Backward", false),
 	SearchIgnoreCaseOption(FBCategoryKey::SEARCH, SEARCH, "IgnoreCase", true),
 	SearchInWholeTextOption(FBCategoryKey::SEARCH, SEARCH, "WholeText", false),
@@ -93,11 +103,7 @@
 	SearchPatternOption(FBCategoryKey::SEARCH, SEARCH, PATTERN, "") {
 }
 
-bool SearchAction::isVisible() {
-	return !fbreader().currentView().isNull();
-}
-
-void SearchAction::run() {
+void SearchPatternAction::run() {
 	ZLTextView &textView = (ZLTextView&)*fbreader().currentView();
 
 	shared_ptr<ZLDialog> searchDialog = ZLDialogManager::instance().createDialog(ZLResourceKey("textSearchDialog"));
@@ -124,10 +130,10 @@
 	}
 }
 
-FindNextAction::FindNextAction(FBReader &fbreader) : FBAction(fbreader) {
+FindNextAction::FindNextAction(FBReader &fbreader) : SearchAction(fbreader) {
 }
 
-bool FindNextAction::isEnabled() {
+bool FindNextAction::isEnabled() const {
 	shared_ptr<ZLView> view = fbreader().currentView();
 	return (!view.isNull()) && ((ZLTextView&)*view).canFindNext();
 }
@@ -136,10 +142,10 @@
 	((ZLTextView&)*fbreader().currentView()).findNext();
 }
 
-FindPreviousAction::FindPreviousAction(FBReader &fbreader) : FBAction(fbreader) {
+FindPreviousAction::FindPreviousAction(FBReader &fbreader) : SearchAction(fbreader) {
 }
 
-bool FindPreviousAction::isEnabled() {
+bool FindPreviousAction::isEnabled() const {
 	shared_ptr<ZLView> view = fbreader().currentView();
 	return (!view.isNull()) && ((ZLTextView&)*view).canFindPrevious();
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/SearchOnNetworkAction.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/SearchOnNetworkAction.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/SearchOnNetworkAction.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/SearchOnNetworkAction.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLStringUtil.h>
+#include <ZLDialogManager.h>
+#include <ZLDialog.h>
+
+#include "../options/FBOptions.h"
+#include "FBReaderActions.h"
+#include "NetLibraryView.h"
+#include "../network/NetworkLink.h"
+
+ShowNetworkLibraryAction::ShowNetworkLibraryAction(FBReader &fbreader) : SetModeAction(fbreader, FBReader::NET_LIBRARY_MODE, FBReader::BOOK_TEXT_MODE) {
+}
+
+bool ShowNetworkLibraryAction::isVisible() const {
+	return SetModeAction::isVisible() && NetworkLinkCollection::instance().containsEnabledLinks();
+}
+
+SearchOnNetworkAction::SearchOnNetworkAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::NET_LIBRARY_MODE) {
+}
+
+void SearchOnNetworkAction::run() {
+	((NetLibraryView&)*fbreader().myNetLibraryView).search();
+	fbreader().refreshWindow();
+}
+
+AdvancedSearchOnNetworkAction::AdvancedSearchOnNetworkAction(FBReader &fbreader) : ModeDependentAction(fbreader, FBReader::NET_LIBRARY_MODE) {
+}
+
+void AdvancedSearchOnNetworkAction::run() {
+	shared_ptr<ZLDialog> searchDialog = ZLDialogManager::instance().createDialog(ZLResourceKey("networkSearchDialog"));
+
+	ZLStringOption titleOption(FBCategoryKey::SEARCH, "network", "title", "");
+	searchDialog->addOption(ZLResourceKey("bookTitle"), titleOption);
+	ZLStringOption authorOption(FBCategoryKey::SEARCH, "network", "author", "");
+	searchDialog->addOption(ZLResourceKey("author"), authorOption);
+	ZLStringOption seriesOption(FBCategoryKey::SEARCH, "network", "series", "");
+	searchDialog->addOption(ZLResourceKey("series"), seriesOption);
+	ZLStringOption categoryOption(FBCategoryKey::SEARCH, "network", "category", "");
+	searchDialog->addOption(ZLResourceKey("category"), categoryOption);
+	ZLStringOption descriptionOption(FBCategoryKey::SEARCH, "network", "description", "");
+	searchDialog->addOption(ZLResourceKey("description"), descriptionOption);
+	searchDialog->addButton(ZLResourceKey("go"), true);
+	searchDialog->addButton(ZLDialogManager::CANCEL_BUTTON, false);
+
+	if (searchDialog->run()) {
+		searchDialog->acceptValues();
+		searchDialog.reset();
+		std::string titlePattern = titleOption.value();
+		ZLStringUtil::stripWhiteSpaces(titlePattern);
+		std::string authorPattern = authorOption.value();
+		ZLStringUtil::stripWhiteSpaces(authorPattern);
+		std::string seriesPattern = seriesOption.value();
+		ZLStringUtil::stripWhiteSpaces(seriesPattern);
+		std::string categoryPattern = categoryOption.value();
+		ZLStringUtil::stripWhiteSpaces(categoryPattern);
+		std::string descriptionPattern = descriptionOption.value();
+		ZLStringUtil::stripWhiteSpaces(descriptionPattern);
+
+		if (!titlePattern.empty() ||
+				!authorPattern.empty() ||
+				!seriesPattern.empty() ||
+				!categoryPattern.empty() ||
+				!descriptionPattern.empty()) {
+			((NetLibraryView&)*fbreader().myNetLibraryView).search(titlePattern, authorPattern, seriesPattern, categoryPattern, descriptionPattern);
+			fbreader().refreshWindow();
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/TimeUpdater.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/TimeUpdater.cpp
--- fbreader-0.8.17/fbreader/src/fbreader/TimeUpdater.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/TimeUpdater.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/fbreader/TimeUpdater.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/fbreader/TimeUpdater.h
--- fbreader-0.8.17/fbreader/src/fbreader/TimeUpdater.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/fbreader/TimeUpdater.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/BitStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/BitStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/BitStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/BitStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/BitStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/BitStream.h
--- fbreader-0.8.17/fbreader/src/formats/chm/BitStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/BitStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMFile.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFile.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMFile.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFile.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMFile.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFile.h
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMFile.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFile.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMFileImage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFileImage.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMFileImage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFileImage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMFileImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFileImage.h
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMFileImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMFileImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,13 +27,72 @@
 #include "CHMFileImage.h"
 #include "CHMReferenceCollection.h"
 #include "HHCReader.h"
+#include "HHCReferenceCollector.h"
 #include "../txt/PlainTextFormat.h"
 #include "HtmlSectionReader.h"
 #include "../../description/BookDescription.h"
+#include "../util/MergedStream.h"
+#include "../html/HtmlReaderStream.h"
 
 bool CHMPlugin::acceptsFile(const ZLFile &file) const {
-	const std::string &extension = file.extension();
-	return (extension == "CHM") || (extension == "chm");
+	return file.extension() == "chm";
+}
+
+class CHMTextStream : public MergedStream {
+
+public:
+	CHMTextStream(CHMFileInfo &chmFile, shared_ptr<ZLInputStream> base);
+
+private:
+	void resetToStart();
+	shared_ptr<ZLInputStream> nextStream();
+
+private:
+	CHMFileInfo &myCHMFile;
+	shared_ptr<ZLInputStream> myBase;
+	std::vector<std::string> myEntryNames;
+	size_t myIndex;
+};
+
+CHMTextStream::CHMTextStream(CHMFileInfo &chmFile, shared_ptr<ZLInputStream> base) : myCHMFile(chmFile), myBase(base) {
+}
+
+void CHMTextStream::resetToStart() {
+	myIndex = 0;
+
+	if (!myEntryNames.empty()) {
+		return;
+	}
+
+	CHMFileInfo::FileNames names = myCHMFile.sectionNames(myBase);
+	if (names.empty()) {
+		return;
+	}
+
+	CHMReferenceCollection referenceCollection;
+
+	referenceCollection.addReference(names.Start, false);
+	referenceCollection.addReference(names.Home, false);
+
+	shared_ptr<ZLInputStream> tocStream = myCHMFile.entryStream(myBase, names.TOC);
+	if (!tocStream.isNull() && tocStream->open()) {
+		referenceCollection.setPrefix(names.TOC);
+		HHCReferenceCollector(referenceCollection).readDocument(*tocStream);
+	}
+
+	while (referenceCollection.containsNonProcessedReferences()) {
+		myEntryNames.push_back(referenceCollection.nextReference());
+	}
+}
+
+shared_ptr<ZLInputStream> CHMTextStream::nextStream() {
+	while (myIndex < myEntryNames.size()) {
+		shared_ptr<ZLInputStream> stream = myCHMFile.entryStream(myBase, myEntryNames[myIndex++]);
+		if (!stream.isNull()) {
+			return new HtmlReaderStream(stream, 50000);
+		}
+	}
+	return 0;
 }
 
 bool CHMPlugin::readDescription(const std::string &path, BookDescription &description) const {
@@ -53,6 +112,7 @@
 		return false;
 	}
 
+	/*
 	shared_ptr<ZLInputStream> entryStream = chmFile.entryStream(stream, names.Start);
 	if (entryStream.isNull()) {
 		entryStream = chmFile.entryStream(stream, names.Home);
@@ -60,16 +120,18 @@
 	if (entryStream.isNull()) {
 		entryStream = chmFile.entryStream(stream, names.TOC);
 	}
-	/*
+	/ *
 	if (entryStream.isNull()) {
 		chmFile.entryStream(stream, names.Index);
 	}
-	*/
+	* /
 	if (entryStream.isNull()) {
 		return false;
 	}
+	*/
 
-	detectEncodingAndLanguage(description, *entryStream);
+	CHMTextStream textStream(chmFile, stream);
+	detectEncodingAndLanguage(description, textStream);
 	if (description.encoding().empty()) {
 		return false;
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMReferenceCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMReferenceCollection.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMReferenceCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMReferenceCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/CHMReferenceCollection.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMReferenceCollection.h
--- fbreader-0.8.17/fbreader/src/formats/chm/CHMReferenceCollection.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/CHMReferenceCollection.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/E8Decoder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/E8Decoder.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/E8Decoder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/E8Decoder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HHCReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/HHCReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@
 	return true;
 }
 
-bool HHCReader::characterDataHandler(const char*, int, bool) {
+bool HHCReader::characterDataHandler(const char*, size_t, bool) {
 	return true;
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HHCReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReader.h
--- fbreader-0.8.17/fbreader/src/formats/chm/HHCReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
 	void endDocumentHandler();
 
 	bool tagHandler(const HtmlTag &tag);
-	bool characterDataHandler(const char*, int, bool);
+	bool characterDataHandler(const char*, size_t, bool);
 
 private:
 	CHMReferenceCollection &myReferenceCollection;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HHCReferenceCollector.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReferenceCollector.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/HHCReferenceCollector.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReferenceCollector.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLUnicodeUtil.h>
+
+#include "HHCReferenceCollector.h"
+#include "CHMReferenceCollection.h"
+
+HHCReferenceCollector::HHCReferenceCollector(CHMReferenceCollection &collection) : HtmlReader("US-ASCII"), myReferenceCollection(collection) {
+}
+
+void HHCReferenceCollector::startDocumentHandler() {
+}
+
+void HHCReferenceCollector::endDocumentHandler() {
+}
+
+static const std::string PARAM = "PARAM";
+static const std::string NAME = "NAME";
+static const std::string VALUE = "VALUE";
+static const std::string NAME_VALUE = "Name";
+static const std::string LOCAL_VALUE = "Local";
+
+bool HHCReferenceCollector::tagHandler(const HtmlTag &tag) {
+	if (tag.Start) {
+		if (tag.Name == PARAM) {
+			std::string name;
+			std::string value;
+			for (std::vector<HtmlAttribute>::const_iterator it = tag.Attributes.begin(); it != tag.Attributes.end(); ++it) {
+				if (it->Name == NAME) {
+					name = it->Value;
+				} else if (it->Name == VALUE) {
+					value = it->Value;
+				}
+			}
+			if (name == LOCAL_VALUE) {
+				myReferenceCollection.addReference(value, true);
+			}
+		}
+	}
+	return true;
+}
+
+bool HHCReferenceCollector::characterDataHandler(const char*, size_t, bool) {
+	return true;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HHCReferenceCollector.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReferenceCollector.h
--- fbreader-0.8.17/fbreader/src/formats/chm/HHCReferenceCollector.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HHCReferenceCollector.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __HHCREFERENCECOLLECTOR_H__
+#define __HHCREFERENCECOLLECTOR_H__
+
+#include <vector>
+
+#include "../html/HtmlReader.h"
+
+class CHMReferenceCollection;
+
+class HHCReferenceCollector : public HtmlReader {
+
+public:
+	HHCReferenceCollector(CHMReferenceCollection &collection);
+
+private:
+	void startDocumentHandler();
+	void endDocumentHandler();
+
+	bool tagHandler(const HtmlTag &tag);
+	bool characterDataHandler(const char*, size_t, bool);
+
+private:
+	CHMReferenceCollection &myReferenceCollection;
+};
+
+#endif /* __HHCREFERENCECOLLECTOR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HtmlSectionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HtmlSectionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/HtmlSectionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HtmlSectionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,9 +79,10 @@
 			} else if ((hyperlinkType() == REGULAR) && (tag.Attributes[i].Name == "HREF")) {
 				const std::string &value = tag.Attributes[i].Value;
 				if (!value.empty()) {
-					if (MiscUtil::isReference(value)) {
-						bookReader().addHyperlinkControl(EXTERNAL_HYPERLINK, value);
-						setHyperlinkType(EXTERNAL_HYPERLINK);
+					FBTextKind referenceType = MiscUtil::referenceType(value);
+					if (referenceType != INTERNAL_HYPERLINK) {
+						bookReader().addHyperlinkControl(referenceType, value);
+						setHyperlinkType(referenceType);
 					} else {
 						const int index = value.find('#');
 						std::string sectionName = (index == -1) ? value : value.substr(0, index);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HtmlSectionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HtmlSectionReader.h
--- fbreader-0.8.17/fbreader/src/formats/chm/HtmlSectionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HtmlSectionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HuffmanDecoder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HuffmanDecoder.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/HuffmanDecoder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HuffmanDecoder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/HuffmanDecoder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/HuffmanDecoder.h
--- fbreader-0.8.17/fbreader/src/formats/chm/HuffmanDecoder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/HuffmanDecoder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/LZXDecompressor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/LZXDecompressor.cpp
--- fbreader-0.8.17/fbreader/src/formats/chm/LZXDecompressor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/LZXDecompressor.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/chm/LZXDecompressor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/chm/LZXDecompressor.h
--- fbreader-0.8.17/fbreader/src/formats/chm/LZXDecompressor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/chm/LZXDecompressor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/css/StyleSheetParser.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetParser.cpp
--- fbreader-0.8.17/fbreader/src/formats/css/StyleSheetParser.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetParser.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <cctype>
+#include <string.h>
+
+#include <ZLStringUtil.h>
+#include <ZLInputStream.h>
+
+#include "StyleSheetParser.h"
+
+StyleSheetTableParser::StyleSheetTableParser(StyleSheetTable &table) : myTable(table) {
+}
+
+void StyleSheetTableParser::storeData(const std::string &tagName, const std::string &className, const StyleSheetTable::AttributeMap &map) {
+	myTable.addMap(tagName, className, map);
+}
+
+shared_ptr<ZLTextStyleEntry> StyleSheetSingleStyleParser::parseString(const char *text) {
+	myReadState = ATTRIBUTE_NAME;
+	parse(text, strlen(text));
+	shared_ptr<ZLTextStyleEntry> control = StyleSheetTable::createControl(myMap);
+	reset();
+	return control;
+}
+
+StyleSheetParser::StyleSheetParser() : myReadState(TAG_NAME), myInsideComment(false) {
+}
+
+StyleSheetParser::~StyleSheetParser() {
+}
+
+void StyleSheetParser::reset() {
+	myWord.erase();
+	myAttributeName.erase();
+	myReadState = TAG_NAME;
+	myInsideComment = false;
+	myTagName.erase();
+	myClassName.erase();
+	myMap.clear();
+}
+
+void StyleSheetParser::parse(ZLInputStream &stream) {
+	if (stream.open()) {
+		char *buffer = new char[1024];
+		while (true) {
+			int len = stream.read(buffer, 1024);
+			if (len == 0) {
+				break;
+			}
+			parse(buffer, len);
+		}
+		delete[] buffer;
+		stream.close();
+	}
+}
+
+void StyleSheetParser::parse(const char *text, int len) {
+	const char *start = text;
+	const char *end = text + len;
+	for (const char *ptr = start; ptr != end; ++ptr) {
+		if (isspace(*ptr)) {
+			if (start != ptr) {
+				myWord.append(start, ptr - start);
+			}
+			processWord(myWord);
+			myWord.erase();
+			start = ptr + 1;
+		} else if (isControlSymbol(*ptr)) {
+			if (start != ptr) {
+				myWord.append(start, ptr - start);
+			}
+			processWord(myWord);
+			myWord.erase();
+			processControl(*ptr);
+			start = ptr + 1;
+		}
+	}
+	if (start < end) {
+		myWord.append(start, end - start);
+	}
+}
+
+bool StyleSheetParser::isControlSymbol(const char symbol) {
+	switch (symbol) {
+		case '{':
+		case '}':
+		case ';':
+		case ':':
+			return true;
+		default:
+			return false;
+	}
+}
+
+void StyleSheetParser::storeData(const std::string&, const std::string&, const StyleSheetTable::AttributeMap&) {
+}
+
+void StyleSheetParser::processControl(const char control) {
+	switch (control) {
+		case '{':
+			myReadState = (myReadState == TAG_NAME) ? ATTRIBUTE_NAME : BROKEN;
+			break;
+		case '}':
+			if (myReadState != BROKEN) {
+				storeData(myTagName, myClassName, myMap);
+			}
+			myReadState = TAG_NAME;
+			myTagName.erase();
+			myClassName.erase();
+			myMap.clear();
+			break;
+		case ';':
+			myReadState =
+				((myReadState == ATTRIBUTE_VALUE) ||
+				 (myReadState == ATTRIBUTE_NAME)) ? ATTRIBUTE_NAME : BROKEN;
+			break;
+		case ':':
+			myReadState = (myReadState == ATTRIBUTE_NAME) ? ATTRIBUTE_VALUE : BROKEN;
+			break;
+	}
+}
+
+void StyleSheetParser::processWord(std::string &word) {
+	while (!word.empty()) {
+		int index = word.find(myInsideComment ? "*/" : "/*");
+		if (!myInsideComment) {
+			if (index == -1) {
+				processWordWithoutComments(word);
+			} else if (index > 0) {
+				processWordWithoutComments(word.substr(0, index));
+			}
+		}
+		if (index == -1) {
+			break;
+		}
+		myInsideComment = !myInsideComment;
+		word.erase(0, index + 2);
+	}
+}
+	
+void StyleSheetParser::processWordWithoutComments(const std::string &word) {	
+	switch (myReadState) {
+		case TAG_NAME:
+		{
+			int index = word.find('.');
+			if (index == -1) {
+				if (myTagName.empty()) {
+					myTagName = word;
+				} else {
+					myTagName += ' ' + word;
+				}
+			} else {
+				if (myTagName.empty()) {
+					myTagName = word.substr(0, index);
+					myClassName = word.substr(index + 1);
+				} else {
+					myTagName += ' ' + word.substr(0, index);
+					myClassName += ' ' + word.substr(index + 1);
+				}
+			}
+			myMap.clear();
+			break;
+		}
+		case ATTRIBUTE_NAME:
+			myAttributeName = word;
+			myMap[myAttributeName].clear();
+			break;
+		case ATTRIBUTE_VALUE:
+			myMap[myAttributeName].push_back(word);
+			break;
+		case BROKEN:
+			break;
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/css/StyleSheetParser.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetParser.h
--- fbreader-0.8.17/fbreader/src/formats/css/StyleSheetParser.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetParser.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __STYLESHEETPARSER_H__
+#define __STYLESHEETPARSER_H__
+
+#include "StyleSheetTable.h"
+
+class ZLInputStream;
+
+class StyleSheetParser {
+
+protected:
+	StyleSheetParser();
+
+public:
+	virtual ~StyleSheetParser();
+	void reset();
+	void parse(ZLInputStream &stream);
+	void parse(const char *text, int len);
+
+protected:
+	virtual void storeData(const std::string &tagName, const std::string &className, const StyleSheetTable::AttributeMap &map);
+
+private:
+	bool isControlSymbol(const char symbol);
+	void processWord(std::string &word);
+	void processWordWithoutComments(const std::string &word);
+	void processControl(const char control);
+
+private:
+	std::string myWord;
+	std::string myAttributeName;
+	enum {
+		TAG_NAME,
+		ATTRIBUTE_NAME,
+		ATTRIBUTE_VALUE,
+		BROKEN,
+	} myReadState;
+	bool myInsideComment;
+	std::string myTagName;
+	std::string myClassName;
+	StyleSheetTable::AttributeMap myMap;
+
+friend class StyleSheetSingleStyleParser;
+};
+
+class StyleSheetTableParser : public StyleSheetParser {
+
+public:
+	StyleSheetTableParser(StyleSheetTable &table);
+
+private:
+	void storeData(const std::string &tagName, const std::string &className, const StyleSheetTable::AttributeMap &map);
+
+private:
+	StyleSheetTable &myTable;
+};
+
+class StyleSheetSingleStyleParser : public StyleSheetParser {
+
+public:
+	shared_ptr<ZLTextStyleEntry> parseString(const char *text);
+};
+
+#endif /* __STYLESHEETPARSER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/css/StyleSheetTable.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetTable.cpp
--- fbreader-0.8.17/fbreader/src/formats/css/StyleSheetTable.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetTable.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+
+#include <ZLStringUtil.h>
+
+#include "StyleSheetTable.h"
+
+bool StyleSheetTable::isEmpty() const {
+	return myControlMap.empty() && myPageBreakBeforeMap.empty() && myPageBreakAfterMap.empty();
+}
+
+void StyleSheetTable::addMap(const std::string &tag, const std::string &aClass, const AttributeMap &map) {
+	if ((!tag.empty() || !aClass.empty()) && !map.empty()) {
+		Key key(tag, aClass);
+		myControlMap[key] = createControl(map);
+		const std::vector<std::string> &pbb = values(map, "page-break-before");
+		if (!pbb.empty()) {
+			if ((pbb[0] == "always") ||
+					(pbb[0] == "left") ||
+					(pbb[0] == "right")) {
+				myPageBreakBeforeMap[key] = true;
+			} else if (pbb[0] == "avoid") {
+				myPageBreakBeforeMap[key] = false;
+			}
+		}
+		const std::vector<std::string> &pba = values(map, "page-break-after");
+		if (!pba.empty()) {
+			if ((pba[0] == "always") ||
+					(pba[0] == "left") ||
+					(pba[0] == "right")) {
+				myPageBreakAfterMap[key] = true;
+			} else if (pba[0] == "avoid") {
+				myPageBreakAfterMap[key] = false;
+			}
+		}
+	}
+}
+
+static void parseLength(const std::string &toParse, short &size, ZLTextStyleEntry::SizeUnit &unit) {
+	if (ZLStringUtil::stringEndsWith(toParse, "%")) {
+		unit = ZLTextStyleEntry::SIZE_UNIT_PERCENT;
+		size = atoi(toParse.data());
+	} else if (ZLStringUtil::stringEndsWith(toParse, "em")) {
+		unit = ZLTextStyleEntry::SIZE_UNIT_EM_100;
+		size = (short)(100 * atof(toParse.data()));
+	} else if (ZLStringUtil::stringEndsWith(toParse, "ex")) {
+		unit = ZLTextStyleEntry::SIZE_UNIT_EX_100;
+		size = (short)(100 * atof(toParse.data()));
+	} else {
+		unit = ZLTextStyleEntry::SIZE_UNIT_PIXEL;
+		size = atoi(toParse.data());
+	}
+}
+
+void StyleSheetTable::setLength(ZLTextStyleEntry &entry, ZLTextStyleEntry::Length name, const AttributeMap &map, const std::string &attributeName) {
+	StyleSheetTable::AttributeMap::const_iterator it = map.find(attributeName);
+	if (it == map.end()) {
+		return;
+	}
+	const std::vector<std::string> &values = it->second;
+	if (!values.empty() && !values[0].empty()) {
+		short size;
+		ZLTextStyleEntry::SizeUnit unit;
+		parseLength(values[0], size, unit);
+		entry.setLength(name, size, unit);
+	}
+}
+
+bool StyleSheetTable::doBreakBefore(const std::string &tag, const std::string &aClass) const {
+	std::map<Key,bool>::const_iterator it = myPageBreakBeforeMap.find(Key(tag, aClass));
+	if (it != myPageBreakBeforeMap.end()) {
+		return it->second;
+	}
+
+	it = myPageBreakBeforeMap.find(Key("", aClass));
+	if (it != myPageBreakBeforeMap.end()) {
+		return it->second;
+	}
+
+	it = myPageBreakBeforeMap.find(Key(tag, ""));
+	if (it != myPageBreakBeforeMap.end()) {
+		return it->second;
+	}
+
+	return false;
+}
+
+bool StyleSheetTable::doBreakAfter(const std::string &tag, const std::string &aClass) const {
+	std::map<Key,bool>::const_iterator it = myPageBreakAfterMap.find(Key(tag, aClass));
+	if (it != myPageBreakAfterMap.end()) {
+		return it->second;
+	}
+
+	it = myPageBreakAfterMap.find(Key("", aClass));
+	if (it != myPageBreakAfterMap.end()) {
+		return it->second;
+	}
+
+	it = myPageBreakAfterMap.find(Key(tag, ""));
+	if (it != myPageBreakAfterMap.end()) {
+		return it->second;
+	}
+
+	return false;
+}
+
+shared_ptr<ZLTextStyleEntry> StyleSheetTable::control(const std::string &tag, const std::string &aClass) const {
+	std::map<Key,shared_ptr<ZLTextStyleEntry> >::const_iterator it =
+		myControlMap.find(Key(tag, aClass));
+	return (it != myControlMap.end()) ? it->second : 0;
+}
+
+const std::vector<std::string> &StyleSheetTable::values(const AttributeMap &map, const std::string &name) {
+	const AttributeMap::const_iterator it = map.find(name);
+	if (it != map.end()) {
+		return it->second;
+	}
+	static const std::vector<std::string> emptyVector;
+	return emptyVector;
+}
+
+shared_ptr<ZLTextStyleEntry> StyleSheetTable::createControl(const AttributeMap &styles) {
+	shared_ptr<ZLTextStyleEntry> entry = new ZLTextStyleEntry();
+
+	const std::vector<std::string> &alignment = values(styles, "text-align");
+	if (!alignment.empty()) {
+		if (alignment[0] == "justify") {
+			entry->setAlignmentType(ALIGN_JUSTIFY);
+		} else if (alignment[0] == "left") {
+			entry->setAlignmentType(ALIGN_LEFT);
+		} else if (alignment[0] == "right") {
+			entry->setAlignmentType(ALIGN_RIGHT);
+		} else if (alignment[0] == "center") {
+			entry->setAlignmentType(ALIGN_CENTER);
+		}
+	}
+
+	const std::vector<std::string> &bold = values(styles, "font-weight");
+	if (!bold.empty()) {
+		int num = -1;
+		if (bold[0] == "bold") {
+			num = 700;
+		} else if (bold[0] == "normal") {
+			num = 400;
+		} else if ((bold[0].length() == 3) &&
+							 (bold[0][1] == '0') &&
+							 (bold[0][2] == '0') &&
+							 (bold[0][0] >= '1') &&
+							 (bold[0][0] <= '9')) {
+			num = 100 * (bold[0][0] - '0');
+		} else if (bold[0] == "bolder") {
+		} else if (bold[0] == "lighter") {
+		}
+		if (num != -1) {
+			entry->setBold(num >= 600);
+		}
+	}
+
+	const std::vector<std::string> &italic = values(styles, "font-style");
+	if (!italic.empty()) {
+		entry->setItalic(italic[0] == "italic");
+	}
+
+	const std::vector<std::string> &fontFamily = values(styles, "font-family");
+	if (!fontFamily.empty() && !fontFamily[0].empty()) {
+		entry->setFontFamily(fontFamily[0]);
+	}
+
+	const std::vector<std::string> &fontSize = values(styles, "font-size");
+	if (!fontSize.empty()) {
+		if (fontSize[0] == "xx-small") {
+			entry->setFontSizeMag(-3);
+		} else if (fontSize[0] == "x-small") {
+			entry->setFontSizeMag(-2);
+		} else if (fontSize[0] == "small") {
+			entry->setFontSizeMag(-1);
+		} else if (fontSize[0] == "medium") {
+			entry->setFontSizeMag(0);
+		} else if (fontSize[0] == "large") {
+			entry->setFontSizeMag(1);
+		} else if (fontSize[0] == "x-large") {
+			entry->setFontSizeMag(2);
+		} else if (fontSize[0] == "xx-large") {
+			entry->setFontSizeMag(3);
+		}
+	}
+
+	setLength(*entry, ZLTextStyleEntry::LENGTH_LEFT_INDENT, styles, "margin-left");
+	setLength(*entry, ZLTextStyleEntry::LENGTH_RIGHT_INDENT, styles, "margin-right");
+	setLength(*entry, ZLTextStyleEntry::LENGTH_FIRST_LINE_INDENT_DELTA, styles, "text-indent");
+	setLength(*entry, ZLTextStyleEntry::LENGTH_SPACE_BEFORE, styles, "margin-top");
+	setLength(*entry, ZLTextStyleEntry::LENGTH_SPACE_BEFORE, styles, "padding-top");
+	setLength(*entry, ZLTextStyleEntry::LENGTH_SPACE_AFTER, styles, "margin-bottom");
+	setLength(*entry, ZLTextStyleEntry::LENGTH_SPACE_AFTER, styles, "padding-bottom");
+
+	return entry;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/css/StyleSheetTable.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetTable.h
--- fbreader-0.8.17/fbreader/src/formats/css/StyleSheetTable.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/css/StyleSheetTable.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __STYLESHEETTABLE_H__
+#define __STYLESHEETTABLE_H__
+
+#include <string>
+#include <map>
+#include <vector>
+
+#include <shared_ptr.h>
+
+#include <ZLTextParagraph.h>
+
+class StyleSheetTable {
+
+public:
+	typedef std::map<std::string,std::vector<std::string> > AttributeMap;
+	static shared_ptr<ZLTextStyleEntry> createControl(const AttributeMap &map);
+
+private:
+	void addMap(const std::string &tag, const std::string &aClass, const AttributeMap &map);
+
+	static void setLength(ZLTextStyleEntry &entry, ZLTextStyleEntry::Length name, const AttributeMap &map, const std::string &attributeName);
+	static const std::vector<std::string> &values(const AttributeMap &map, const std::string &name);
+
+public:
+	bool isEmpty() const;
+	bool doBreakBefore(const std::string &tag, const std::string &aClass) const;
+	bool doBreakAfter(const std::string &tag, const std::string &aClass) const;
+	shared_ptr<ZLTextStyleEntry> control(const std::string &tag, const std::string &aClass) const;
+
+private:
+	struct Key {
+		Key(const std::string &tag, const std::string &aClass);
+
+		const std::string TagName;
+		const std::string ClassName;
+
+		bool operator < (const Key &key) const;
+	};
+
+	std::map<Key,shared_ptr<ZLTextStyleEntry> > myControlMap;
+	std::map<Key,bool> myPageBreakBeforeMap;
+	std::map<Key,bool> myPageBreakAfterMap;
+
+friend class StyleSheetTableParser;
+};
+
+inline StyleSheetTable::Key::Key(const std::string &tag, const std::string &aClass) : TagName(tag), ClassName(aClass) {
+}
+
+inline bool StyleSheetTable::Key::operator < (const StyleSheetTable::Key &key) const {
+	return (TagName < key.TagName) || ((TagName == key.TagName) && (ClassName < key.ClassName));
+}
+
+#endif /* __STYLESHEETTABLE_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 	myReadText = false;
 }
 
-void DocBookBookReader::characterDataHandler(const char *text, int len) {
+void DocBookBookReader::characterDataHandler(const char *text, size_t len) {
 	addDataToBuffer(text, len);
 }
 	
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 private:
 	bool myReadText;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 	myDepth = 0;
 }
 
-void DocBookDescriptionReader::characterDataHandler(const char *text, int len) {
+void DocBookDescriptionReader::characterDataHandler(const char *text, size_t len) {
 	if (myReadTitle) {
 		myDescription.title().append(text, len);
 	} else {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookDescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 private:
 	WritableBookDescription myDescription;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/docbook/DocBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/docbook/DocBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/docbook/DocBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/createPlugin.sh /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/createPlugin.sh
--- fbreader-0.8.17/fbreader/src/formats/dummy/createPlugin.sh	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/createPlugin.sh	2009-04-30 22:26:45.000000000 +0100
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ $# != 2 ]; then
-	echo "usage: ";
+	echo "usage: $0 <lower_case_format_name> <full_case_format_name>";
 	exit 0;
 fi;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/DummyBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/dummy/DummyBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 }
 
 /*
-void DummyBookReader::characterDataHandler(const char *text, int len) {
+void DummyBookReader::characterDataHandler(const char *text, size_t len) {
 }
 
 void DummyBookReader::startElementHandler(int tag, const char **xmlattributes) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/DummyBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/dummy/DummyBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 	/*
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 	*/
 
 private:
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/DummyDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/dummy/DummyDescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 }
 
 /*
-void DummyDescriptionReader::characterDataHandler(const char *text, int len) {
+void DummyDescriptionReader::characterDataHandler(const char *text, size_t len) {
 }
 
 void DummyDescriptionReader::startElementHandler(int tag, const char **) {
@@ -36,4 +36,5 @@
 */
 
 bool DummyDescriptionReader::readDescription(shared_ptr<ZLInputStream> stream) {
+	return false;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/DummyDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/dummy/DummyDescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 	/*
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 	*/
 
 private:
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/DummyPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/dummy/DummyPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/dummy/DummyPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/dummy/DummyPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/dummy/DummyPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/EncodedTextReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/EncodedTextReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/EncodedTextReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/EncodedTextReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/EncodedTextReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/EncodedTextReader.h
--- fbreader-0.8.17/fbreader/src/formats/EncodedTextReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/EncodedTextReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/Base64EncodedImage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/Base64EncodedImage.cpp
--- fbreader-0.8.17/fbreader/src/formats/fb2/Base64EncodedImage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/Base64EncodedImage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/Base64EncodedImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/Base64EncodedImage.h
--- fbreader-0.8.17/fbreader/src/formats/fb2/Base64EncodedImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/Base64EncodedImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2BookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2BookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2BookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2BookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include "FB2BookReader.h"
 #include "Base64EncodedImage.h"
 #include "../../bookmodel/BookModel.h"
+#include "../../constants/XMLNamespace.h"
 
 FB2BookReader::FB2BookReader(BookModel &model) : myModelReader(model) {
 	myInsideCoverpage = false;
@@ -42,7 +43,7 @@
 	myInsideTitle = false;
 }
 
-void FB2BookReader::characterDataHandler(const char *text, int len) {
+void FB2BookReader::characterDataHandler(const char *text, size_t len) {
 	if ((len > 0) && (myProcessingImage || myModelReader.paragraphIsOpen())) {
 		std::string str(text, len);
 		if (myProcessingImage) {
@@ -159,7 +160,13 @@
 			const char *ref = attributeValue(xmlattributes, myHrefAttributeName.c_str());
 			if (ref != 0) {
 				if (ref[0] == '#') {
-					myHyperlinkType = FOOTNOTE;
+					const char *type = attributeValue(xmlattributes, "type");
+					static const std::string NOTE = "note";
+					if ((type != 0) && (NOTE == type)) {
+						myHyperlinkType = FOOTNOTE;
+					} else {
+						myHyperlinkType = INTERNAL_HYPERLINK;
+					}
 					++ref;
 				} else {
 					myHyperlinkType = EXTERNAL_HYPERLINK;
@@ -174,8 +181,8 @@
 		case _IMAGE:
 		{
 			const char *ref = attributeValue(xmlattributes, myHrefAttributeName.c_str());
-			const char *vOffset = attributeValue(xmlattributes, "voffset");
-			char offset = (vOffset != 0) ? atoi(vOffset) : 0;
+			//const char *vOffset = attributeValue(xmlattributes, "voffset");
+			//char offset = (vOffset != 0) ? atoi(vOffset) : 0;
 			if ((ref != 0) && (*ref == '#')) {
 				++ref;
 				if ((myCoverImageReference != ref) ||
@@ -190,8 +197,9 @@
 		}
 		case _BINARY:
 		{
+			static const std::string STRANGE_MIME_TYPE = "text/xml";
 			const char *contentType = attributeValue(xmlattributes, "content-type");
-			if ((contentType != 0) && (id != 0)) {
+			if ((contentType != 0) && (id != 0) && (STRANGE_MIME_TYPE != contentType)) {
 				myCurrentImage = new Base64EncodedImage(contentType);
 				myModelReader.addImage(id, myCurrentImage);
 				myProcessingImage = true;
@@ -314,10 +322,9 @@
 }
 
 void FB2BookReader::namespaceListChangedHandler() {
-	const std::string XLINK_REFERENCE = "http://www.w3.org/1999/xlink";
 	const std::map<std::string,std::string> namespaceMap = namespaces();
 	for (std::map<std::string,std::string>::const_iterator it = namespaceMap.begin(); it != namespaceMap.end(); ++it) {
-		if (ZLStringUtil::stringStartsWith(it->second, XLINK_REFERENCE)) {
+		if (ZLStringUtil::stringStartsWith(it->second, XMLNamespace::XLink)) {
 			myHrefAttributeName = it->first + ":href";
 			return;
 		}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2BookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2BookReader.h
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2BookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2BookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 	bool processNamespaces() const;
 	void namespaceListChangedHandler();
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2DescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2DescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2DescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2DescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 	myDescription.removeAllTags();
 }
 
-void FB2DescriptionReader::characterDataHandler(const char *text, int len) {
+void FB2DescriptionReader::characterDataHandler(const char *text, size_t len) {
 	switch (myReadState) {
 		case READ_TITLE:
 			myDescription.title().append(text, len);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2DescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2DescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2DescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2DescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 private:
 	WritableBookDescription myDescription;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2Plugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Plugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2Plugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Plugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2Plugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Plugin.h
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2Plugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Plugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2Reader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Reader.cpp
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2Reader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Reader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2Reader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Reader.h
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2Reader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2Reader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2TagManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2TagManager.cpp
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2TagManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2TagManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/fb2/FB2TagManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2TagManager.h
--- fbreader-0.8.17/fbreader/src/formats/fb2/FB2TagManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/fb2/FB2TagManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/FormatPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/FormatPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/FormatPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/FormatPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,36 +27,67 @@
 void FormatPlugin::detectEncodingAndLanguage(BookDescription &description, ZLInputStream &stream) {
 	std::string language = description.language();
 	std::string encoding = description.encoding();
-	if (encoding.empty() || language.empty()) {
-		PluginCollection &collection = PluginCollection::instance();
-		if (language.empty()) {
-			language = collection.DefaultLanguageOption.value();
-		}
-		if (encoding.empty()) {
-			encoding = collection.DefaultEncodingOption.value();
+	if (!encoding.empty() && !language.empty()) {
+		return;
+	}
+
+	PluginCollection &collection = PluginCollection::instance();
+	if (language.empty()) {
+		language = collection.DefaultLanguageOption.value();
+	}
+	if (encoding.empty()) {
+		encoding = collection.DefaultEncodingOption.value();
+	}
+	if (collection.LanguageAutoDetectOption.value() && stream.open()) {
+		static const int BUFSIZE = 65536;
+		char *buffer = new char[BUFSIZE];
+		const size_t size = stream.read(buffer, BUFSIZE);
+		stream.close();
+		shared_ptr<ZLLanguageDetector::LanguageInfo> info =
+			ZLLanguageDetector().findInfo(buffer, size);
+		delete[] buffer;
+		if (!info.isNull()) {
+			if (!info->Language.empty()) {
+				language = info->Language;
+			}
+			encoding = info->Encoding;
+			if ((encoding == "US-ASCII") || (encoding == "ISO-8859-1")) {
+				encoding = "windows-1252";
+			}
 		}
-		if (collection.LanguageAutoDetectOption.value() && stream.open()) {
-			static const int BUFSIZE = 65536;
-			char *buffer = new char[BUFSIZE];
-			const size_t size = stream.read(buffer, BUFSIZE);
-			stream.close();
-			shared_ptr<ZLLanguageDetector::LanguageInfo> info =
-				ZLLanguageDetector().findInfo(buffer, size);
-			delete[] buffer;
-			if (!info.isNull()) {
+	}
+	WritableBookDescription(description).encoding() = encoding;
+	WritableBookDescription(description).language() = language;
+}
+
+void FormatPlugin::detectLanguage(BookDescription &description, ZLInputStream &stream) {
+	std::string language = description.language();
+	if (!language.empty()) {
+		return;
+	}
+
+	PluginCollection &collection = PluginCollection::instance();
+	if (language.empty()) {
+		language = collection.DefaultLanguageOption.value();
+	}
+	if (collection.LanguageAutoDetectOption.value() && stream.open()) {
+		static const int BUFSIZE = 65536;
+		char *buffer = new char[BUFSIZE];
+		const size_t size = stream.read(buffer, BUFSIZE);
+		stream.close();
+		shared_ptr<ZLLanguageDetector::LanguageInfo> info =
+			ZLLanguageDetector().findInfo(buffer, size);
+		delete[] buffer;
+		if (!info.isNull()) {
+			if (!info->Language.empty()) {
 				language = info->Language;
-				encoding = info->Encoding;
-				if ((encoding == "US-ASCII") || (encoding == "ISO-8859-1")) {
-					encoding = "windows-1252";
-				}
 			}
 		}
-		WritableBookDescription(description).encoding() = encoding;
-		WritableBookDescription(description).language() = language;
 	}
+	WritableBookDescription(description).language() = language;
 }
 
-const std::string &FormatPlugin::tryOpen(const std::string &path) const {
+const std::string &FormatPlugin::tryOpen(const std::string&) const {
 	static const std::string EMPTY = "";
 	return EMPTY;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/FormatPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/FormatPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/FormatPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/FormatPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,6 +60,7 @@
 
 protected:
 	static void detectEncodingAndLanguage(BookDescription &description, ZLInputStream &stream);
+	static void detectLanguage(BookDescription &description, ZLInputStream &stream);
 };
 
 class PluginCollection {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include <cctype>
 
+#include <ZLFile.h>
 #include <ZLFileImage.h>
 #include <ZLStringUtil.h>
 
@@ -27,7 +28,7 @@
 #include "../txt/PlainTextFormat.h"
 #include "../util/MiscUtil.h"
 #include "../../bookmodel/BookModel.h"
-#include "StyleSheetParser.h"
+#include "../css/StyleSheetParser.h"
 
 HtmlTagAction::HtmlTagAction(HtmlBookReader &reader) : myReader(reader) {
 }
@@ -106,9 +107,15 @@
 
 void HtmlIgnoreTagAction::run(const HtmlReader::HtmlTag &tag) {
 	if (tag.Start) {
-		++myReader.myIgnoreDataCounter;
+		if (myTagNames.find(tag.Name) == myTagNames.end()) {
+			++myReader.myIgnoreDataCounter;
+			myTagNames.insert(tag.Name);
+		}
 	} else {
-		--myReader.myIgnoreDataCounter;
+		if (myTagNames.find(tag.Name) != myTagNames.end()) {
+			--myReader.myIgnoreDataCounter;
+			myTagNames.erase(tag.Name);
+		}
 	}
 }
 
@@ -131,9 +138,12 @@
 					if (value[0] == '#') {
 						setHyperlinkType(INTERNAL_HYPERLINK);
 						bookReader().addHyperlinkControl(INTERNAL_HYPERLINK, value.substr(1));
-					} else if (MiscUtil::isReference(value)) {
-						setHyperlinkType(EXTERNAL_HYPERLINK);
-						bookReader().addHyperlinkControl(EXTERNAL_HYPERLINK, value);
+					} else {
+						FBTextKind hyperlinkType = MiscUtil::referenceType(value);
+						if (hyperlinkType != INTERNAL_HYPERLINK) {
+							setHyperlinkType(hyperlinkType);
+							bookReader().addHyperlinkControl(hyperlinkType, value);
+						}
 					}
 				}
 			}
@@ -164,11 +174,14 @@
 		bookReader().endParagraph();
 		for (unsigned int i = 0; i < tag.Attributes.size(); ++i) {
 			if (tag.Attributes[i].Name == "SRC") {
-				std::string fileName = MiscUtil::decodeHtmlURL(tag.Attributes[i].Value);
-				bookReader().addImageReference(fileName);
-				bookReader().addImage(fileName,
-					new ZLFileImage("image/auto", myReader.myBaseDirPath + fileName, 0)
-				);
+				const std::string fileName = MiscUtil::decodeHtmlURL(tag.Attributes[i].Value);
+				const std::string filePath = myReader.myBaseDirPath + fileName;
+				if (ZLFile(filePath).exists()) {
+					bookReader().addImageReference(fileName);
+					bookReader().addImage(fileName,
+						new ZLFileImage("image/auto", filePath, 0)
+					);
+				}
 				break;
 			}
 		}
@@ -264,7 +277,7 @@
 }
 
 void HtmlStyleTagAction::run(const HtmlReader::HtmlTag &tag) {
-	myReader.myStyleSheetParser = tag.Start ? new StyleSheetParser(myReader.myStyleSheetTable) : 0;
+	myReader.myStyleSheetParser = tag.Start ? new StyleSheetTableParser(myReader.myStyleSheetTable) : 0;
 	/*
 	if (!tag.Start) {
 		myReader.myStyleSheetTable.dump();
@@ -315,6 +328,8 @@
 		return new HtmlIgnoreTagAction(*this);
 	} else if (tag == "A") {
 		return new HtmlHrefTagAction(*this);
+	} else if (tag == "TD") {
+		return new HtmlBreakTagAction(*this, HtmlBreakTagAction::BREAK_AT_END);
 	} else if (tag == "TR") {
 		return new HtmlBreakTagAction(*this, HtmlBreakTagAction::BREAK_AT_END);
 	} else if (tag == "DIV") {
@@ -389,7 +404,7 @@
 HtmlBookReader::~HtmlBookReader() {
 }
 
-void HtmlBookReader::addConvertedDataToBuffer(const char *text, int len, bool convert) {
+void HtmlBookReader::addConvertedDataToBuffer(const char *text, size_t len, bool convert) {
 	if (len > 0) {
 		if (myDontBreakParagraph) {
 			while ((len > 0) && isspace(*text)) {
@@ -417,6 +432,12 @@
 bool HtmlBookReader::tagHandler(const HtmlTag &tag) {
 	myConverter->reset();
 
+	for (unsigned int i = 0; i < tag.Attributes.size(); ++i) {
+		if (tag.Attributes[i].Name == "ID") {
+			myBookReader.addHyperlinkLabel(tag.Attributes[i].Value);
+			break;
+		}	
+	}
 	shared_ptr<HtmlTagAction> action = myActionMap[tag.Name];
 	if (action.isNull()) {
 		action = createAction(tag.Name);
@@ -427,7 +448,7 @@
 	return true;
 }
 
-void HtmlBookReader::preformattedCharacterDataHandler(const char *text, int len, bool convert) {
+void HtmlBookReader::preformattedCharacterDataHandler(const char *text, size_t len, bool convert) {
 	const char *start = text;
 	const char *end = text + len;
 
@@ -499,7 +520,7 @@
 	}
 }
 
-bool HtmlBookReader::characterDataHandler(const char *text, int len, bool convert) {
+bool HtmlBookReader::characterDataHandler(const char *text, size_t len, bool convert) {
 	if (!myStyleSheetParser.isNull()) {
 		myStyleSheetParser->parse(text, len);
 		return true;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 
 #include "HtmlReader.h"
 #include "../../bookmodel/BookReader.h"
-#include "StyleSheetTable.h"
+#include "../css/StyleSheetTable.h"
 
 class BookModel;
 class PlainTextFormat;
@@ -50,11 +50,11 @@
 	void startDocumentHandler();
 	void endDocumentHandler();
 	bool tagHandler(const HtmlTag &tag);
-	bool characterDataHandler(const char *text, int len, bool convert);
+	bool characterDataHandler(const char *text, size_t len, bool convert);
 
 private:
-	void preformattedCharacterDataHandler(const char *text, int len, bool convert);
-	void addConvertedDataToBuffer(const char *text, int len, bool convert);
+	void preformattedCharacterDataHandler(const char *text, size_t len, bool convert);
+	void addConvertedDataToBuffer(const char *text, size_t len, bool convert);
 
 protected:
 	BookReader myBookReader;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlDescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,7 +45,7 @@
 	return tag.Name != "BODY";
 }
 
-bool HtmlDescriptionReader::characterDataHandler(const char *text, int len, bool) {
+bool HtmlDescriptionReader::characterDataHandler(const char *text, size_t len, bool) {
 	if (myReadTitle) {
 		myDescription.title().append(text, len);
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlDescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 	void endDocumentHandler();
 
 	bool tagHandler(const HtmlTag &tag);
-	bool characterDataHandler(const char *text, int len, bool convert);
+	bool characterDataHandler(const char *text, size_t len, bool convert);
 
 private:
 	bool myReadTitle;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlEntityCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlEntityCollection.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlEntityCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlEntityCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlEntityCollection.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlEntityCollection.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlEntityCollection.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlEntityCollection.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 #include "HtmlPlugin.h"
 #include "HtmlDescriptionReader.h"
 #include "HtmlBookReader.h"
+#include "HtmlReaderStream.h"
 #include "../txt/PlainTextFormat.h"
 #include "../../description/BookDescription.h"
 #include "../util/MiscUtil.h"
@@ -40,7 +41,8 @@
 		return false;
 	}
 
-	detectEncodingAndLanguage(description, *stream);
+	shared_ptr<ZLInputStream> htmlStream = new HtmlReaderStream(stream, 50000);
+	detectEncodingAndLanguage(description, *htmlStream);
 	if (description.encoding().empty()) {
 		return false;
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -184,7 +184,7 @@
 								}
 							} else if (number != 0) {
 								char buffer[4];
-								int len = ZLUnicodeUtil::ucs2ToUtf8(buffer, number);
+								int len = ZLUnicodeUtil::ucs4ToUtf8(buffer, number);
 								if (state == PS_SPECIAL) {
 									characterDataHandler(buffer, len, false);
 								} else {
@@ -278,10 +278,10 @@
 					} else if ((quotationCounter != 1) && ((*ptr == '>') || isspace((unsigned char)*ptr))) {
 						if ((ptr != start) || !currentString.empty()) {
 							currentString.append(start, ptr - start);
-							if (currentString[0] == '"') {
-								currentString = currentString.substr(1, currentString.length() - 2);
-							}
 							appendString(attributeValueString, currentString);
+							if (attributeValueString[0] == '"') {
+								attributeValueString = attributeValueString.substr(1, attributeValueString.length() - 2);
+							}
 							currentTag.setLastAttributeValue(attributeValueString);
 							attributeValueString.erase();
 							quotationCounter = 0;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReader.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,8 +71,10 @@
 	virtual void startDocumentHandler() = 0;
 	virtual void endDocumentHandler() = 0;
 
+	// returns false iff processing must be stopped
 	virtual bool tagHandler(const HtmlTag &tag) = 0;
-	virtual bool characterDataHandler(const char *text, int len, bool convert) = 0;
+	// returns false iff processing must be stopped
+	virtual bool characterDataHandler(const char *text, size_t len, bool convert) = 0;
 
 private:
 	void appendString(std::string &to, std::string &from);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlReaderStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReaderStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlReaderStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReaderStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+
+#include "HtmlReaderStream.h"
+#include "HtmlReader.h"
+
+class HtmlTextOnlyReader : public HtmlReader {
+
+public:
+	HtmlTextOnlyReader(char *buffer, size_t maxSize);
+	size_t size() const;
+
+private:
+	void startDocumentHandler();
+	void endDocumentHandler();
+
+	bool tagHandler(const HtmlTag &tag);
+	bool characterDataHandler(const char *text, size_t len, bool convert);
+
+private:
+	char *myBuffer;
+	size_t myMaxSize;
+	size_t myFilledSize;
+	bool myIgnoreText;
+};
+
+HtmlTextOnlyReader::HtmlTextOnlyReader(char *buffer, size_t maxSize) : HtmlReader(std::string()), myBuffer(buffer), myMaxSize(maxSize), myFilledSize(0), myIgnoreText(false) {
+}
+
+size_t HtmlTextOnlyReader::size() const {
+	return myFilledSize;
+}
+
+void HtmlTextOnlyReader::startDocumentHandler() {
+}
+
+void HtmlTextOnlyReader::endDocumentHandler() {
+}
+
+bool HtmlTextOnlyReader::tagHandler(const HtmlTag &tag) {
+	if (tag.Name == "SCRIPT") {
+		myIgnoreText = tag.Start;
+	}
+	if ((myFilledSize < myMaxSize) && (myFilledSize > 0) && (myBuffer[myFilledSize - 1] != '\n')) {
+		myBuffer[myFilledSize++] = '\n';
+	}
+	return myFilledSize < myMaxSize;
+}
+
+bool HtmlTextOnlyReader::characterDataHandler(const char *text, size_t len, bool) {
+	if (!myIgnoreText) {
+		len = std::min((size_t)len, myMaxSize - myFilledSize);
+		memcpy(myBuffer + myFilledSize, text, len);
+		myFilledSize += len;
+	}
+	return myFilledSize < myMaxSize;
+}
+
+HtmlReaderStream::HtmlReaderStream(shared_ptr<ZLInputStream> base, size_t maxSize) : myBase(base), myBuffer(0), mySize(maxSize) {
+}
+
+HtmlReaderStream::~HtmlReaderStream() {
+	close();
+}
+
+bool HtmlReaderStream::open() {
+	if (myBase.isNull() || !myBase->open()) {
+		return false;
+	}
+	myBuffer = new char[mySize];
+	HtmlTextOnlyReader reader(myBuffer, mySize);
+	reader.readDocument(*myBase);
+	mySize = reader.size();
+	myOffset = 0;
+	myBase->close();
+	return true;
+}
+
+size_t HtmlReaderStream::read(char *buffer, size_t maxSize) {
+	maxSize = std::min(maxSize, mySize - myOffset);
+	if (buffer != 0) {
+		memcpy(buffer, myBuffer, maxSize);
+	}
+	myOffset += maxSize;
+	return maxSize;
+}
+
+void HtmlReaderStream::close() {
+	if (myBuffer != 0) {
+		delete[] myBuffer;
+		myBuffer = 0;
+	}
+}
+
+void HtmlReaderStream::seek(int offset, bool absoluteOffset) {
+	if (!absoluteOffset) {
+		offset += myOffset;
+	}
+	myOffset = std::min(mySize, (size_t)std::max(0, offset));
+}
+
+size_t HtmlReaderStream::offset() const {
+	return myOffset;
+}
+
+size_t HtmlReaderStream::sizeOfOpened() {
+	return mySize;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlReaderStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReaderStream.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlReaderStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlReaderStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __HTMLREADERSTREAM_H__
+#define __HTMLREADERSTREAM_H__
+
+#include <shared_ptr.h>
+#include <ZLInputStream.h>
+
+class HtmlReaderStream : public ZLInputStream {
+
+public:
+	HtmlReaderStream(shared_ptr<ZLInputStream> base, size_t maxSize);
+	~HtmlReaderStream();
+
+private:
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	shared_ptr<ZLInputStream> myBase;
+	char *myBuffer;
+	size_t mySize;
+	size_t myOffset;
+};
+
+#endif /* __HTMLREADERSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/HtmlTagActions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlTagActions.h
--- fbreader-0.8.17/fbreader/src/formats/html/HtmlTagActions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/HtmlTagActions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #ifndef __HTMLTAGACTIONS_H__
 #define __HTMLTAGACTIONS_H__
 
+#include <set>
+
 #include "HtmlBookReader.h"
 
 class HtmlTagAction {
@@ -71,6 +73,9 @@
 public:
 	HtmlIgnoreTagAction(HtmlBookReader &reader);
 	void run(const HtmlReader::HtmlTag &tag);
+
+private:
+	std::set<std::string> myTagNames;
 };
 
 class HtmlHrefTagAction : public HtmlTagAction {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/StyleSheetParser.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetParser.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/StyleSheetParser.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetParser.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <cctype>
-
-#include <ZLStringUtil.h>
-
-#include "StyleSheetParser.h"
-
-StyleSheetParser::StyleSheetParser(StyleSheetTable &table) : myTable(table), myReadState(TAG_NAME), myInsideComment(false) {
-}
-
-void StyleSheetParser::reset() {
-	myWord.erase();
-	myAttributeName.erase();
-	myReadState = TAG_NAME;
-	myInsideComment = false;
-	myElement = StyleSheetTable::Element();
-}
-
-void StyleSheetParser::parse(const char *text, int len) {
-	const char *start = text;
-	const char *end = text + len;
-	for (const char *ptr = start; ptr != end; ++ptr) {
-		if (isspace(*ptr)) {
-			if (start != ptr) {
-				myWord.append(start, ptr - start);
-			}
-			processWord(myWord);
-			myWord.erase();
-			start = ptr + 1;
-		} else if (isControlSymbol(*ptr)) {
-			if (start != ptr) {
-				myWord.append(start, ptr - start);
-			}
-			processWord(myWord);
-			myWord.erase();
-			processControl(*ptr);
-			start = ptr + 1;
-		}
-	}
-}
-
-bool StyleSheetParser::isControlSymbol(const char symbol) {
-	switch (symbol) {
-		case '{':
-		case '}':
-		case ';':
-		case ':':
-			return true;
-		default:
-			return false;
-	}
-}
-
-void StyleSheetParser::processControl(const char control) {
-	switch (control) {
-		case '{':
-			myReadState = (myReadState == TAG_NAME) ? ATTRIBUTE_NAME : BROKEN;
-			break;
-		case '}':
-			if (myReadState != BROKEN) {
-				myTable.addElement(myElement);
-			}
-			myReadState = TAG_NAME;
-			myElement = StyleSheetTable::Element();
-			break;
-		case ';':
-			myReadState =
-				((myReadState == ATTRIBUTE_VALUE) ||
-				 (myReadState == ATTRIBUTE_NAME)) ? ATTRIBUTE_NAME : BROKEN;
-			break;
-		case ':':
-			myReadState = (myReadState == ATTRIBUTE_NAME) ? ATTRIBUTE_VALUE : BROKEN;
-			break;
-	}
-}
-
-void StyleSheetParser::processWord(std::string &word) {
-	while (!word.empty()) {
-		int index = word.find(myInsideComment ? "*/" : "/*");
-		if (!myInsideComment) {
-			if (index == -1) {
-				processWordWithoutComments(word);
-			} else if (index > 0) {
-				processWordWithoutComments(word.substr(0, index));
-			}
-		}
-		if (index == -1) {
-			break;
-		}
-		myInsideComment = !myInsideComment;
-		word.erase(0, index + 2);
-	}
-}
-	
-void StyleSheetParser::processWordWithoutComments(const std::string &word) {	
-	switch (myReadState) {
-		case TAG_NAME:
-		{
-			int index = word.find('.');
-			if (index == -1) {
-				myElement.first.TagName = word;
-			} else {
-				myElement.first.TagName = word.substr(0, index);
-				myElement.first.ClassName = word.substr(index + 1);
-			}
-			break;
-		}
-		case ATTRIBUTE_NAME:
-			myAttributeName = word;
-			myElement.second[myAttributeName].clear();
-			break;
-		case ATTRIBUTE_VALUE:
-			myElement.second[myAttributeName].push_back(word);
-			break;
-		case BROKEN:
-			break;
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/StyleSheetParser.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetParser.h
--- fbreader-0.8.17/fbreader/src/formats/html/StyleSheetParser.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetParser.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __STYLESHEETPARSER_H__
-#define __STYLESHEETPARSER_H__
-
-#include "StyleSheetTable.h"
-
-class StyleSheetParser {
-
-public:
-	StyleSheetParser(StyleSheetTable &table);
-	void reset();
-	void parse(const char *text, int len);
-
-private:
-	bool isControlSymbol(const char symbol);
-	void processWord(std::string &word);
-	void processWordWithoutComments(const std::string &word);
-	void processControl(const char control);
-
-private:
-	StyleSheetTable &myTable;
-
-	std::string myWord;
-	std::string myAttributeName;
-	enum {
-		TAG_NAME,
-		ATTRIBUTE_NAME,
-		ATTRIBUTE_VALUE,
-		BROKEN,
-	} myReadState;
-	bool myInsideComment;
-	StyleSheetTable::Element myElement;
-};
-
-#endif /* __STYLESHEETPARSER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/StyleSheetTable.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetTable.cpp
--- fbreader-0.8.17/fbreader/src/formats/html/StyleSheetTable.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetTable.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "StyleSheetTable.h"
-
-void StyleSheetTable::addElement(const Element &element) {
-	if ((!element.first.TagName.empty() || !element.first.ClassName.empty()) &&
-			!element.second.empty()) {
-		myMap.insert(element);
-	}
-}
-
-//#include <iostream>
-
-void StyleSheetTable::dump() const {
-/*
-	for (std::map<Key,AttributeMap>::const_iterator it = myMap.begin(); it != myMap.end(); ++it) {
-		std::cerr << it->first.TagName << " . " << it->first.ClassName << "\n";
-		for (AttributeMap::const_iterator jt = it->second.begin(); jt != it->second.end(); ++jt) {
-			std::cerr << "  " << jt->first << " =";
-			for (std::vector<std::string>::const_iterator kt = jt->second.begin(); kt != jt->second.end(); ++kt) {
-				std::cerr << " " << *kt;
-			}
-			std::cerr << "\n";
-		}
-	}
-*/
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/html/StyleSheetTable.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetTable.h
--- fbreader-0.8.17/fbreader/src/formats/html/StyleSheetTable.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/html/StyleSheetTable.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __STYLESHEETTABLE_H__
-#define __STYLESHEETTABLE_H__
-
-#include <string>
-#include <map>
-#include <vector>
-
-class StyleSheetTable {
-
-public:
-	struct Key {
-		std::string TagName;
-		std::string ClassName;
-
-		bool operator < (const Key &key) const;
-	};
-
-	typedef std::map<std::string,std::vector<std::string> > AttributeMap;
-
-	typedef std::pair<Key,AttributeMap> Element;
-
-public:
-	void addElement(const Element &element);
-
-	void dump() const;
-
-private:
-	std::map<Key,AttributeMap> myMap;
-};
-
-inline bool StyleSheetTable::Key::operator < (const StyleSheetTable::Key &key) const {
-	return (TagName < key.TagName) || ((TagName == key.TagName) && (ClassName < key.ClassName));
-}
-
-#endif /* __STYLESHEETTABLE_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/NCXReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/NCXReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/oeb/NCXReader.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/NCXReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+
+#include "NCXReader.h"
+
+NCXReader::NCXReader(BookReader &modelReader) : myModelReader(modelReader), myReadState(READ_NONE), myPlayIndex(-65535) {
+}
+
+static const std::string TAG_NAVMAP = "navMap";
+static const std::string TAG_NAVPOINT = "navPoint";
+static const std::string TAG_NAVLABEL = "navLabel";
+static const std::string TAG_CONTENT = "content";
+static const std::string TAG_TEXT = "text";
+
+void NCXReader::startElementHandler(const char *tag, const char **attributes) {
+	switch (myReadState) {
+		case READ_NONE:
+			if (TAG_NAVMAP == tag) {
+				myReadState = READ_MAP;
+			}
+			break;
+		case READ_MAP:
+			if (TAG_NAVPOINT == tag) {
+				const char *order = attributeValue(attributes, "playOrder");
+				myPointStack.push_back(NavPoint((order != 0) ? atoi(order) : myPlayIndex++, myPointStack.size()));
+				myReadState = READ_POINT;
+			}
+			break;
+		case READ_POINT:
+			if (TAG_NAVPOINT == tag) {
+				const char *order = attributeValue(attributes, "playOrder");
+				myPointStack.push_back(NavPoint((order != 0) ? atoi(order) : myPlayIndex++, myPointStack.size()));
+			} else if (TAG_NAVLABEL == tag) {
+				myReadState = READ_LABEL;
+			} else if (TAG_CONTENT == tag) {
+				const char *src = attributeValue(attributes, "src");
+				if (src != 0) {
+					myPointStack.back().ContentHRef = src;
+				}
+			}
+			break;
+		case READ_LABEL:
+			if (TAG_TEXT == tag) {
+				myReadState = READ_TEXT;
+			}
+			break;
+		case READ_TEXT:
+			break;
+	}
+}
+
+void NCXReader::endElementHandler(const char *tag) {
+	switch (myReadState) {
+		case READ_NONE:
+			break;
+		case READ_MAP:
+			if (TAG_NAVMAP == tag) {
+				myReadState = READ_NONE;
+			}
+			break;
+		case READ_POINT:
+			if (TAG_NAVPOINT == tag) {
+				if (myPointStack.back().Text.empty()) {
+					myPointStack.back().Text = "...";
+				}
+				myNavigationMap[myPointStack.back().Order] = myPointStack.back();
+				myPointStack.pop_back();
+				myReadState = myPointStack.empty() ? READ_MAP : READ_POINT;
+			}
+		case READ_LABEL:
+			if (TAG_NAVLABEL == tag) {
+				myReadState = READ_POINT;
+			}
+			break;
+		case READ_TEXT:
+			if (TAG_TEXT == tag) {
+				myReadState = READ_LABEL;
+			}
+			break;
+	}
+}
+
+void NCXReader::characterDataHandler(const char *text, size_t len) {
+	if (myReadState == READ_TEXT) {
+		myPointStack.back().Text.append(text, len);
+	}
+}
+
+const std::map<int,NCXReader::NavPoint> &NCXReader::navigationMap() const {
+	return myNavigationMap;
+}
+
+NCXReader::NavPoint::NavPoint() {
+}
+
+NCXReader::NavPoint::NavPoint(int order, size_t level) : Order(order), Level(level) {
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/NCXReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/NCXReader.h
--- fbreader-0.8.17/fbreader/src/formats/oeb/NCXReader.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/NCXReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __NCXREADER_H__
+#define __NCXREADER_H__
+
+#include <map>
+#include <vector>
+
+#include <ZLXMLReader.h>
+
+#include "../../bookmodel/BookReader.h"
+
+class NCXReader : public ZLXMLReader {
+
+public:
+	struct NavPoint {
+		NavPoint();
+		NavPoint(int order, size_t level);
+
+		int Order;
+		size_t Level;
+		std::string Text;
+		std::string ContentHRef;
+	};
+
+public:
+	NCXReader(BookReader &modelReader);
+	const std::map<int,NavPoint> &navigationMap() const;
+
+private:
+	void startElementHandler(const char *tag, const char **attributes);
+	void endElementHandler(const char *tag);
+	void characterDataHandler(const char *text, size_t len);
+
+private:
+	BookReader &myModelReader;
+	std::map<int,NavPoint> myNavigationMap;
+	std::vector<NavPoint> myPointStack;
+
+	enum {
+		READ_NONE,
+		READ_MAP,
+		READ_POINT,
+		READ_LABEL,
+		READ_TEXT
+	} myReadState;
+
+	int myPlayIndex;
+};
+
+#endif /* __NCXREADER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,20 +19,20 @@
 
 #include <algorithm>
 
+#include <ZLStringUtil.h>
 #include <ZLUnicodeUtil.h>
 #include <ZLFileImage.h>
 
 #include "OEBBookReader.h"
+#include "NCXReader.h"
 #include "../xhtml/XHTMLReader.h"
 #include "../util/MiscUtil.h"
 #include "../../bookmodel/BookModel.h"
+#include "../../constants/XMLNamespace.h"
 
 OEBBookReader::OEBBookReader(BookModel &model) : myModelReader(model) {
 }
 
-void OEBBookReader::characterDataHandler(const char*, int) {
-}
-
 static const std::string MANIFEST = "manifest";
 static const std::string SPINE = "spine";
 static const std::string GUIDE = "guide";
@@ -44,10 +44,18 @@
 static const std::string REFERENCE = "reference";
 
 void OEBBookReader::startElementHandler(const char *tag, const char **xmlattributes) {
-	const std::string tagString = ZLUnicodeUtil::toLower(tag);
+	std::string tagString = ZLUnicodeUtil::toLower(tag);
+	if (!myOPFSchemePrefix.empty() &&
+			ZLStringUtil::stringStartsWith(tagString, myOPFSchemePrefix)) {
+		tagString = tagString.substr(myOPFSchemePrefix.length());
+	}
 	if (MANIFEST == tagString) {
 		myState = READ_MANIFEST;
 	} else if (SPINE == tagString) {
+		const char *toc = attributeValue(xmlattributes, "toc");
+		if (toc != 0) {
+			myNCXTOCFileName = myIdToHref[toc];
+		}
 		myState = READ_SPINE;
 	} else if (GUIDE == tagString) {
 		myState = READ_GUIDE;
@@ -92,7 +100,11 @@
 }
 
 void OEBBookReader::endElementHandler(const char *tag) {
-	const std::string tagString = ZLUnicodeUtil::toLower(tag);
+	std::string tagString = ZLUnicodeUtil::toLower(tag);
+	if (!myOPFSchemePrefix.empty() &&
+			ZLStringUtil::stringStartsWith(tagString, myOPFSchemePrefix)) {
+		tagString = tagString.substr(myOPFSchemePrefix.length());
+	}
 	if ((MANIFEST == tagString) || (SPINE == tagString) || (GUIDE == tagString) || (TOUR == tagString)) {
 		myState = READ_NONE;
 	}
@@ -103,6 +115,7 @@
 
 	myIdToHref.clear();
 	myHtmlFileNames.clear();
+	myNCXTOCFileName.erase();
 	myTourTOC.clear();
 	myGuideTOC.clear();
 	myState = READ_NONE;
@@ -114,8 +127,47 @@
 	myModelReader.setMainTextModel();
 	myModelReader.pushKind(REGULAR);
 
+	XHTMLReader xhtmlReader(myModelReader);
 	for (std::vector<std::string>::const_iterator it = myHtmlFileNames.begin(); it != myHtmlFileNames.end(); ++it) {
-		XHTMLReader(myModelReader).readFile(myFilePrefix, *it, *it);
+		if (it != myHtmlFileNames.begin()) {
+			myModelReader.insertEndOfSectionParagraph();
+		}
+		xhtmlReader.readFile(myFilePrefix + *it, *it);
+	}
+
+	generateTOC();
+
+	return true;
+}
+
+void OEBBookReader::generateTOC() {
+	if (!myNCXTOCFileName.empty()) {
+		NCXReader ncxReader(myModelReader);
+		if (ncxReader.readDocument(myFilePrefix + myNCXTOCFileName)) {
+			const std::map<int,NCXReader::NavPoint> navigationMap = ncxReader.navigationMap();
+			if (!navigationMap.empty()) {
+				size_t level = 0;
+				for (std::map<int,NCXReader::NavPoint>::const_iterator it = navigationMap.begin(); it != navigationMap.end(); ++it) {
+					const NCXReader::NavPoint &point = it->second;
+					int index = myModelReader.model().label(point.ContentHRef).ParagraphNumber;
+					while (level > point.Level) {
+						myModelReader.endContentsParagraph();
+						--level;
+					}
+					while (++level <= point.Level) {
+						myModelReader.beginContentsParagraph(-2);
+						myModelReader.addContentsData("...");
+					}
+					myModelReader.beginContentsParagraph(index);
+					myModelReader.addContentsData(point.Text);
+				}
+				while (level > 0) {
+					myModelReader.endContentsParagraph();
+					--level;
+				}
+				return;
+			}
+		}
 	}
 
 	std::vector<std::pair<std::string,std::string> > &toc = myTourTOC.empty() ? myGuideTOC : myTourTOC;
@@ -127,6 +179,23 @@
 			myModelReader.endContentsParagraph();
 		}
 	}
+}
 
+bool OEBBookReader::processNamespaces() const {
 	return true;
 }
+
+void OEBBookReader::namespaceListChangedHandler() {
+	const std::map<std::string,std::string> &namespaceMap = namespaces();
+	std::map<std::string,std::string>::const_iterator iter = namespaceMap.begin();
+	for (; iter != namespaceMap.end(); ++iter) {
+		if (iter->second == XMLNamespace::OpenPackagingFormat) {
+			break;
+		}
+	}
+	if (iter != namespaceMap.end()) {
+		myOPFSchemePrefix = iter->first + ":";
+	} else {
+		myOPFSchemePrefix.erase();
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,9 +34,13 @@
 	OEBBookReader(BookModel &model);
 	bool readBook(const std::string &fileName);
 
+private:
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	bool processNamespaces() const;
+	void namespaceListChangedHandler();
+
+	void generateTOC();
 
 private:
 	enum ReaderState {
@@ -50,9 +54,12 @@
 	BookReader myModelReader;
 	ReaderState myState;
 
+	std::string myOPFSchemePrefix;
+
 	std::string myFilePrefix;
 	std::map<std::string,std::string> myIdToHref;
 	std::vector<std::string> myHtmlFileNames;
+	std::string myNCXTOCFileName;
 	std::vector<std::pair<std::string,std::string> > myTourTOC;
 	std::vector<std::pair<std::string,std::string> > myGuideTOC;
 };
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBDescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <ZLUnicodeUtil.h>
 
 #include "OEBDescriptionReader.h"
+#include "../../constants/XMLNamespace.h"
 
 OEBDescriptionReader::OEBDescriptionReader(BookDescription &description) : myDescription(description) {
 	myDescription.clearAuthor();
@@ -30,18 +31,21 @@
 
 static const std::string METADATA = "metadata";
 static const std::string DC_METADATA = "dc-metadata";
-static const std::string TITLE_TAG = ":title";
-static const std::string AUTHOR_TAG = ":creator";
-static const std::string SUBJECT_TAG = ":subject";
+static const std::string METADATA_SUFFIX = ":metadata";
+static const std::string TITLE_SUFFIX = ":title";
+static const std::string AUTHOR_SUFFIX = ":creator";
+static const std::string SUBJECT_SUFFIX = ":subject";
+static const std::string LANGUAGE_SUFFIX = ":language";
 static const std::string AUTHOR_ROLE = "aut";
 
-void OEBDescriptionReader::characterDataHandler(const char *text, int len) {
+void OEBDescriptionReader::characterDataHandler(const char *text, size_t len) {
 	switch (myReadState) {
 		case READ_NONE:
 			break;
 		case READ_AUTHOR:
 		case READ_AUTHOR2:
 		case READ_SUBJECT:
+		case READ_LANGUAGE:
 			myBuffer.append(text, len);
 			break;
 		case READ_TITLE:
@@ -51,26 +55,36 @@
 }
 
 bool OEBDescriptionReader::isDublinCoreNamespace(const std::string &nsId) const {
-	static const std::string DC_SCHEME_PREFIX = "http://purl.org/dc/elements";
+	const std::map<std::string,std::string> &namespaceMap = namespaces();
+	std::map<std::string,std::string>::const_iterator iter = namespaces().find(nsId);
+	return
+		((iter != namespaceMap.end()) &&
+		 (ZLStringUtil::stringStartsWith(iter->second, XMLNamespace::DublinCorePrefix) ||
+		  ZLStringUtil::stringStartsWith(iter->second, XMLNamespace::DublinCoreLegacyPrefix)));
+}
+
+bool OEBDescriptionReader::isOPFNamespace(const std::string &nsId) const {
 	const std::map<std::string,std::string> &namespaceMap = namespaces();
 	std::map<std::string,std::string>::const_iterator iter = namespaceMap.find(nsId);
 	return
 		(iter != namespaceMap.end()) &&
-		ZLStringUtil::stringStartsWith(iter->second, DC_SCHEME_PREFIX);
+		(iter->second == XMLNamespace::OpenPackagingFormat);
 }
 
 void OEBDescriptionReader::startElementHandler(const char *tag, const char **attributes) {
 	const std::string tagString = ZLUnicodeUtil::toLower(tag);
-	if ((METADATA == tagString) || (DC_METADATA == tagString)) {
+	if ((METADATA == tagString) || (DC_METADATA == tagString) ||
+			(ZLStringUtil::stringEndsWith(tagString, METADATA_SUFFIX) &&
+			 isOPFNamespace(tagString.substr(0, tagString.length() - METADATA_SUFFIX.length())))) {
 		myDCMetadataTag = tagString;
 		myReadMetaData = true;
 	} else if (myReadMetaData) {
-		if (ZLStringUtil::stringEndsWith(tagString, TITLE_TAG)) {
-			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - TITLE_TAG.length()))) {
+		if (ZLStringUtil::stringEndsWith(tagString, TITLE_SUFFIX)) {
+			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - TITLE_SUFFIX.length()))) {
 				myReadState = READ_TITLE;
 			}
-		} else if (ZLStringUtil::stringEndsWith(tagString, AUTHOR_TAG)) {
-			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - AUTHOR_TAG.length()))) {
+		} else if (ZLStringUtil::stringEndsWith(tagString, AUTHOR_SUFFIX)) {
+			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - AUTHOR_SUFFIX.length()))) {
 				const char *role = attributeValue(attributes, "role");
 				if (role == 0) {
 					myReadState = READ_AUTHOR2;
@@ -78,10 +92,14 @@
 					myReadState = READ_AUTHOR;
 				}
 			}
-		} else if (ZLStringUtil::stringEndsWith(tagString, SUBJECT_TAG)) {
-			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - SUBJECT_TAG.length()))) {
+		} else if (ZLStringUtil::stringEndsWith(tagString, SUBJECT_SUFFIX)) {
+			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - SUBJECT_SUFFIX.length()))) {
 				myReadState = READ_SUBJECT;
 			}
+		} else if (ZLStringUtil::stringEndsWith(tagString, LANGUAGE_SUFFIX)) {
+			if (isDublinCoreNamespace(tagString.substr(0, tagString.length() - LANGUAGE_SUFFIX.length()))) {
+				myReadState = READ_LANGUAGE;
+			}
 		}
 	}
 }
@@ -99,6 +117,19 @@
 				myAuthorList2.push_back(myBuffer);
 			} else if (myReadState == READ_SUBJECT) {
 				myDescription.addTag(myBuffer);
+			} else if (myReadState == READ_LANGUAGE) {
+				int index = myBuffer.find('-');
+				if (index >= 0) {
+					myBuffer = myBuffer.substr(0, index);
+				}
+				index = myBuffer.find('_');
+				if (index >= 0) {
+					myBuffer = myBuffer.substr(0, index);
+				}
+				if (myBuffer == "cz") {
+					myBuffer = "cs";
+				}
+				myDescription.language() = myBuffer;
 			}
 			myBuffer.erase();
 		}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBDescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,11 +34,12 @@
 
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 	bool processNamespaces() const;
 
 private:
 	bool isDublinCoreNamespace(const std::string &nsId) const;
+	bool isOPFNamespace(const std::string &nsId) const;
 
 private:
 	WritableBookDescription myDescription;
@@ -49,7 +50,8 @@
 		READ_AUTHOR,
 		READ_AUTHOR2,
 		READ_TITLE,
-		READ_SUBJECT
+		READ_SUBJECT,
+		READ_LANGUAGE,
 	} myReadState;
 
 	std::string myDCMetadataTag;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,11 +20,14 @@
 #include <ZLFile.h>
 #include <ZLStringUtil.h>
 #include <ZLDir.h>
+#include <ZLInputStream.h>
 
 #include "OEBPlugin.h"
 #include "OEBDescriptionReader.h"
 #include "OEBBookReader.h"
+#include "OEBTextStream.h"
 #include "../../description/BookDescription.h"
+#include "../../bookmodel/BookModel.h"
 
 static const std::string OPF = "opf";
 static const std::string OEBZIP = "oebzip";
@@ -64,10 +67,33 @@
 }
 
 bool OEBPlugin::readDescription(const std::string &path, BookDescription &description) const {
-	return OEBDescriptionReader(description).readDescription(opfFileName(path));
+	shared_ptr<ZLInputStream> lock = ZLFile(path).inputStream();
+	const std::string opf = opfFileName(path);
+	bool code = OEBDescriptionReader(description).readDescription(opf);
+	if (code && description.language().empty()) {
+		shared_ptr<ZLInputStream> oebStream = new OEBTextStream(opf);
+		detectLanguage(description, *oebStream);
+	}
+	return code;
+}
+
+class InputStreamLock : public ZLUserData {
+
+public:
+	InputStreamLock(shared_ptr<ZLInputStream> stream);
+
+private:
+	shared_ptr<ZLInputStream> myStream;
+};
+
+InputStreamLock::InputStreamLock(shared_ptr<ZLInputStream> stream) : myStream(stream) {
 }
 
 bool OEBPlugin::readModel(const BookDescription &description, BookModel &model) const {
+	model.addUserData(
+		"inputStreamLock",
+		new InputStreamLock(ZLFile(description.fileName()).inputStream())
+	);
 	return OEBBookReader(model).readBook(opfFileName(description.fileName()));
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBTextStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBTextStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBTextStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBTextStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <map>
+
+#include <ZLFile.h>
+#include <ZLXMLReader.h>
+#include <ZLUnicodeUtil.h>
+
+#include "OEBTextStream.h"
+#include "../util/MiscUtil.h"
+#include "../util/XMLTextStream.h"
+
+class XHTMLFilesCollector : public ZLXMLReader {
+
+public:
+	XHTMLFilesCollector(std::vector<std::string> &xhtmlFileNames);
+
+private:
+	void startElementHandler(const char *tag, const char **attributes);
+	void endElementHandler(const char *tag);
+
+private:
+	std::vector<std::string> &myXHTMLFileNames;
+	std::map<std::string,std::string> myIdToHref;
+	enum {
+		READ_NONE,
+		READ_MANIFEST,
+		READ_SPINE
+	} myState;
+};
+
+XHTMLFilesCollector::XHTMLFilesCollector(std::vector<std::string> &xhtmlFileNames) : myXHTMLFileNames(xhtmlFileNames), myState(READ_NONE) {
+}
+
+static const std::string MANIFEST = "manifest";
+static const std::string SPINE = "spine";
+static const std::string ITEM = "item";
+static const std::string ITEMREF = "itemref";
+
+void XHTMLFilesCollector::startElementHandler(const char *tag, const char **xmlattributes) {
+	const std::string tagString = ZLUnicodeUtil::toLower(tag);
+	if (MANIFEST == tagString) {
+		myState = READ_MANIFEST;
+	} else if (SPINE == tagString) {
+		myState = READ_SPINE;
+	} else if ((myState == READ_MANIFEST) && (ITEM == tagString)) {
+		const char *id = attributeValue(xmlattributes, "id");
+		const char *href = attributeValue(xmlattributes, "href");
+		if ((id != 0) && (href != 0)) {
+			myIdToHref[id] = href;
+		}
+	} else if ((myState == READ_SPINE) && (ITEMREF == tagString)) {
+		const char *id = attributeValue(xmlattributes, "idref");
+		if (id != 0) {
+			const std::string &fileName = myIdToHref[id];
+			if (!fileName.empty()) {
+				myXHTMLFileNames.push_back(fileName);
+			}
+		}
+	}
+}
+
+void XHTMLFilesCollector::endElementHandler(const char *tag) {
+	if (SPINE == ZLUnicodeUtil::toLower(tag)) {
+		interrupt();
+	}
+}
+
+OEBTextStream::OEBTextStream(const std::string &opfFileName) {
+	myFilePrefix = MiscUtil::htmlDirectoryPrefix(opfFileName);
+	XHTMLFilesCollector(myXHTMLFileNames).readDocument(opfFileName);
+}
+
+void OEBTextStream::resetToStart() {
+	myIndex = 0;
+}
+
+shared_ptr<ZLInputStream> OEBTextStream::nextStream() {
+	if (myIndex >= myXHTMLFileNames.size()) {
+		return 0;
+	}
+	ZLFile xhtmlFile(myFilePrefix + myXHTMLFileNames[myIndex++]);
+	return new XMLTextStream(xhtmlFile.inputStream(), "body");
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/oeb/OEBTextStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBTextStream.h
--- fbreader-0.8.17/fbreader/src/formats/oeb/OEBTextStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/oeb/OEBTextStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __OEBTEXTSTREAM_H__
+#define __OEBTEXTSTREAM_H__
+
+#include <vector>
+#include <string>
+
+#include "../util/MergedStream.h"
+
+class OEBTextStream : public MergedStream {
+
+public:
+	OEBTextStream(const std::string &opfFileName);
+
+private:
+	void resetToStart();
+	shared_ptr<ZLInputStream> nextStream();
+
+private:
+	std::string myFilePrefix;
+	std::vector<std::string> myXHTMLFileNames;
+	size_t myIndex;
+};
+
+#endif /* __OEBTEXTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/openreader/OpenReaderPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/openreader/OpenReaderPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/openreader/OpenReaderPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/openreader/OpenReaderPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/openreader/OpenReaderPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/openreader/OpenReaderPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/openreader/OpenReaderPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/openreader/OpenReaderPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/openreader/ORBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/openreader/ORBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 ORBookReader::ORBookReader(BookModel &model) : myModelReader(model) {
 }
 
-void ORBookReader::characterDataHandler(const char *data, int len) {
+void ORBookReader::characterDataHandler(const char *data, size_t len) {
 	if (myState == READ_TOCTITLE) {
 		myTOCTitle.append(data, len);
 	}
@@ -151,7 +151,7 @@
 
 	for (std::vector<std::string>::const_iterator it = myHtmlFilesOrder.begin(); it != myHtmlFilesOrder.end(); ++it) {
 		myHtmlFileIDs.erase(*it);
-		XHTMLReader(myModelReader).readFile(myFilePrefix, myResources[*it], *it);
+		XHTMLReader(myModelReader).readFile(myFilePrefix + myResources[*it], *it);
 	}
 
 	int level = 1;
@@ -173,7 +173,7 @@
 	for (std::set<std::string>::const_iterator it = myHtmlFileIDs.begin(); it != myHtmlFileIDs.end(); ++it) {
 		myModelReader.setFootnoteTextModel(*it);
 		myModelReader.pushKind(REGULAR);
-		XHTMLReader(myModelReader).readFile(myFilePrefix, myResources[*it], *it);
+		XHTMLReader(myModelReader).readFile(myFilePrefix + myResources[*it], *it);
 	}
 
 	for (std::map<std::string,std::string>::const_iterator it = myImageIDs.begin(); it != myImageIDs.end(); ++it) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/openreader/ORBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/openreader/ORBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 private:
 	enum ReaderState {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/openreader/ORDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/openreader/ORDescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 static const std::string AUTHOR_TAG = "dc:creator";
 static const std::string AUTHOR_ROLE = "aut";
 
-void ORDescriptionReader::characterDataHandler(const char *text, int len) {
+void ORDescriptionReader::characterDataHandler(const char *text, size_t len) {
 	switch (myReadState) {
 		case READ_NONE:
 			break;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/openreader/ORDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/openreader/ORDescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/openreader/ORDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 private:
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 	const std::vector<std::string> &externalDTDs() const;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/DocDecompressor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/DocDecompressor.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/DocDecompressor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/DocDecompressor.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/DocDecompressor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/DocDecompressor.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/DocDecompressor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/DocDecompressor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/HtmlMetainfoReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@
 void HtmlMetainfoReader::endDocumentHandler() {
 }
 
-bool HtmlMetainfoReader::characterDataHandler(const char *text, int len, bool convert) {
+bool HtmlMetainfoReader::characterDataHandler(const char *text, size_t len, bool convert) {
 	if (myReadTitle || myReadAuthor || myReadTags) {
 		if (convert) {
 			myConverter->convert(myBuffer, text, text + len);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/HtmlMetainfoReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/HtmlMetainfoReader.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/HtmlMetainfoReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/HtmlMetainfoReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 	void endDocumentHandler();
 
 	bool tagHandler(const HtmlTag &tag);
-	bool characterDataHandler(const char *text, int len, bool convert);
+	bool characterDataHandler(const char *text, size_t len, bool convert);
 
 private:
 	WritableBookDescription myDescription;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketHtmlBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -285,7 +285,7 @@
 	setProcessPreTag(false);
 }
 
-bool MobipocketHtmlBookReader::characterDataHandler(const char *text, int len, bool convert) {
+bool MobipocketHtmlBookReader::characterDataHandler(const char *text, size_t len, bool convert) {
 	myTocReader.appendText(text, len);
 	return HtmlBookReader::characterDataHandler(text, len, convert);
 }
@@ -301,11 +301,12 @@
 		std::pair<int,int> firstImageLocation = ((MobipocketStream&)stream).imageLocation(0);
 		fileStream->seek(firstImageLocation.first, false);
 		while ((firstImageLocation.first > 0) && (firstImageLocation.second > 0)) {
-			if (firstImageLocation.second > 10) {
-				fileStream->read(bu, 10);
+			if (firstImageLocation.second > 4) {
+				fileStream->read(bu, 4);
+				static const char jpegStart[2] = { (char)0xFF, (char)0xd8 };
 				if ((strncmp(bu, "BM", 2) == 0) ||
 						(strncmp(bu, "GIF8", 4) == 0) ||
-						(strncmp(bu + 6, "JFIF", 4) == 0)) {
+						(strncmp(bu, jpegStart, 2) == 0)) {
 					found = true;
 					break;
 				}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketHtmlBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 private:
 	void startDocumentHandler();
 	bool tagHandler(const HtmlTag &tag);
-	bool characterDataHandler(const char *text, int len, bool convert);
+	bool characterDataHandler(const char *text, size_t len, bool convert);
 	shared_ptr<HtmlTagAction> createAction(const std::string &tag);
 
 public:
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,14 @@
 
 #include <ZLFile.h>
 #include <ZLInputStream.h>
+#include <ZLEncodingConverter.h>
+#include <ZLStringUtil.h>
+#include <ZLLanguageUtil.h>
 
 #include "PdbPlugin.h"
 #include "MobipocketStream.h"
 #include "MobipocketHtmlBookReader.h"
+#include "../../description/BookDescription.h"
 
 bool MobipocketPlugin::acceptsFile(const ZLFile &file) const {
 	const std::string type = PdbPlugin::fileType(file);
@@ -37,3 +41,103 @@
 	static const std::string ICON_NAME = "mobipocket";
 	return ICON_NAME;
 }
+
+bool MobipocketPlugin::readDescription(const std::string &path, BookDescription &description) const {
+	shared_ptr<ZLInputStream> stream = ZLFile(path).inputStream();
+	if (stream.isNull() || ! stream->open()) {
+		return false;
+	}
+	PdbHeader header;
+	if (!header.read(stream)) {
+		return false;
+	}
+	stream->seek(header.Offsets[0] + 16, true);
+	char test[5];
+	test[4] = '\0';
+	stream->read(test, 4);
+	static const std::string MOBI = "MOBI";
+	if (MOBI != test) {
+		return PalmDocLikePlugin::readDescription(path, description);
+	}
+
+	WritableBookDescription wDescription(description);
+
+	unsigned long length;
+	PdbUtil::readUnsignedLong(*stream, length);
+
+	stream->seek(4, false);
+
+	unsigned long encodingCode;
+	PdbUtil::readUnsignedLong(*stream, encodingCode);
+	if (wDescription.encoding().empty()) {
+		ZLEncodingConverterInfoPtr info = ZLEncodingCollection::instance().info(encodingCode);
+		if (!info.isNull()) {
+			wDescription.encoding() = info->name();
+		}
+	}
+
+	stream->seek(52, false);
+
+	unsigned long fullNameOffset;
+	PdbUtil::readUnsignedLong(*stream, fullNameOffset);
+	unsigned long fullNameLength;
+	PdbUtil::readUnsignedLong(*stream, fullNameLength);
+
+	unsigned long languageCode;
+	PdbUtil::readUnsignedLong(*stream, languageCode);
+	wDescription.language() = ZLLanguageUtil::languageByCode(languageCode & 0xFF, (languageCode >> 8) & 0xFF);
+
+	stream->seek(32, false);
+
+	unsigned long exthFlags;
+	PdbUtil::readUnsignedLong(*stream, exthFlags);
+	if (exthFlags & 0x40) {
+		stream->seek(header.Offsets[0] + 16 + length, true);
+
+		stream->read(test, 4);
+		static const std::string EXTH = "EXTH";
+		if (EXTH == test) {
+			stream->seek(4, false);
+			unsigned long recordsNum;
+			PdbUtil::readUnsignedLong(*stream, recordsNum);
+			for (unsigned long i = 0; i < recordsNum; ++i) {
+				unsigned long type;
+				PdbUtil::readUnsignedLong(*stream, type);
+				unsigned long size;
+				PdbUtil::readUnsignedLong(*stream, size);
+				if (size > 8) {
+					std::string value(size - 8, '\0');
+					stream->read((char*)value.data(), size - 8);
+					switch (type) {
+						case 100:
+						{
+							int index = value.find(',');
+							if (index != -1) {
+								std::string part0 = value.substr(0, index);
+								std::string part1 = value.substr(index + 1);
+								ZLStringUtil::stripWhiteSpaces(part0);
+								ZLStringUtil::stripWhiteSpaces(part1);
+								value = part1 + ' ' + part0;
+							} else {
+								ZLStringUtil::stripWhiteSpaces(value);
+							}
+							wDescription.addAuthor(value);
+							break;
+						}
+						case 105:
+							wDescription.addTag(value);
+							break;
+					}
+				}
+			}
+		}
+	}
+
+	stream->seek(header.Offsets[0] + fullNameOffset, true);
+	std::string title(fullNameLength, '\0');
+	stream->read((char*)title.data(), fullNameLength);
+	wDescription.title() = title;
+
+	stream->close();
+	return PalmDocLikePlugin::readDescription(path, description);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketStream.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/MobipocketStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/MobipocketStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocLikePlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocStream.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PalmDocStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PalmDocStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PdbPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PdbPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 #include <ZLFile.h>
 #include <ZLInputStream.h>
 #include <ZLOptions.h>
-#include <ZLUnicodeUtil.h>
 
 #include "PdbPlugin.h"
 #include "../../description/BookDescriptionUtil.h"
@@ -30,7 +29,7 @@
 }
 
 std::string PdbPlugin::fileType(const ZLFile &file) {
-	const std::string extension = ZLUnicodeUtil::toLower(file.extension());
+	const std::string &extension = file.extension();
 	if ((extension != "prc") && (extension != "pdb") && (extension != "mobi")) {
 		return "";
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PdbPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PdbPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -84,6 +84,7 @@
 public:
 	bool acceptsFile(const ZLFile &file) const;
 	const std::string &iconName() const;
+	bool readDescription(const std::string &path, BookDescription &description) const;
 
 	void readDocumentInternal(const std::string &fileName, BookModel &model, const class PlainTextFormat &format, const std::string &encoding, ZLInputStream &stream) const;
 };
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PdbReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PdbReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PdbReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbReader.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PdbReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PdbStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PdbStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PdbStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbStream.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PdbStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PdbStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -185,6 +185,10 @@
 	return 256 * (unsigned char)*ptr + (unsigned char)*(ptr + 1);
 }
 
+static unsigned int fourBytes(char *ptr) {
+	return 65536 * twoBytes(ptr) + twoBytes(ptr + 2);
+}
+
 static std::string fromNumber(unsigned int num) {
 	std::string str;
 	ZLStringUtil::appendNumber(str, num);
@@ -217,16 +221,22 @@
 		case 0x22:
 			if (!myParagraphStarted) {
 				if (myForcedEntry == 0) {
-					myForcedEntry = new ZLTextForcedControlEntry();
+					myForcedEntry = new ZLTextStyleEntry();
 				}
-				myForcedEntry->setLeftIndent(*(ptr + 1));
-				myForcedEntry->setRightIndent(*(ptr + 2));
+				myForcedEntry->setLength(
+					ZLTextStyleEntry::LENGTH_LEFT_INDENT,
+					*(ptr + 1), ZLTextStyleEntry::SIZE_UNIT_PIXEL
+				);
+				myForcedEntry->setLength(
+					ZLTextStyleEntry::LENGTH_RIGHT_INDENT,
+					*(ptr + 2), ZLTextStyleEntry::SIZE_UNIT_PIXEL
+				);
 			}
 			break;
 		case 0x29:
 			if (!myParagraphStarted) {
 				if (myForcedEntry == 0) {
-					myForcedEntry = new ZLTextForcedControlEntry();
+					myForcedEntry = new ZLTextStyleEntry();
 				}
 				switch (*(ptr + 1)) {
 					case 0: myForcedEntry->setAlignmentType(ALIGN_LEFT); break;
@@ -262,17 +272,18 @@
 		case 0x78: // strike-through text is ignored
 			break;
 		case 0x83: 
+		case 0x85:
 		{
-			char utf8[4];
-			int len = ZLUnicodeUtil::ucs2ToUtf8(utf8, twoBytes(ptr + 2));
+			ZLUnicodeUtil::Ucs4Char symbol =
+				(((unsigned char)*ptr) == 0x83) ? twoBytes(ptr + 2) : fourBytes(ptr + 2);
+			char utf8[6];
+			int len = ZLUnicodeUtil::ucs4ToUtf8(utf8, symbol);
 			safeBeginParagraph();
 			addData(std::string(utf8, len));
 			myBufferIsEmpty = false;
 			myBytesToSkip = *(ptr + 1);
 			break;
 		}
-		case 0x85: // TODO: process 4-byte unicode character
-			break;
 		case 0x8E: // custom font operations are ignored
 		case 0x8C:
 		case 0x8A:
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@
 	std::string myConvertedTextBuffer;
 	bool myParagraphStarted;
 	bool myBufferIsEmpty;
-	ZLTextForcedControlEntry *myForcedEntry;
+	ZLTextStyleEntry *myForcedEntry;
 	std::vector<std::pair<FBTextKind,bool> > myDelayedControls;
 	std::vector<std::string> myDelayedHyperlinks;
 	unsigned short myCompressionVersion;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerImages.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerImages.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerImages.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerImages.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerImages.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerImages.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerImages.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerImages.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerTextStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerTextStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerTextStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerTextStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/PluckerTextStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerTextStream.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/PluckerTextStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/PluckerTextStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/SimplePdbPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/SimplePdbPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/SimplePdbPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/SimplePdbPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/ZTXTPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/ZTXTPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/ZTXTPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/ZTXTPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/ZTXTStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/ZTXTStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdb/ZTXTStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/ZTXTStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@
 		++myRecordIndex;
 		size_t currentOffset = myHeader.Offsets[myRecordIndex];
 		// Hmm, this works on examples from manybooks.net,
-		// but I don't what thi code means :((
+		// but I don't understand what this code means :((
 		if (myRecordIndex == 1) {
 			currentOffset += 2;
 		}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdb/ZTXTStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdb/ZTXTStream.h
--- fbreader-0.8.17/fbreader/src/formats/pdb/ZTXTStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdb/ZTXTStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfBookReader.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <stdlib.h>
+
+#include <iostream>
+
+#include <ZLStringUtil.h>
+#include <ZLInputStream.h>
+
+#include "PdfBookReader.h"
+#include "PdfObject.h"
+#include "../../bookmodel/BookModel.h"
+
+static void readLine(ZLInputStream &stream, std::string &buffer) {
+	buffer.clear();
+	char ch;
+	while (1) {
+		if (stream.read(&ch, 1) != 1) {
+			return;
+		}
+		if ((ch == 10) || (ch == 13)) {
+			if (!buffer.empty()) {
+				return;
+			}
+		} else {
+			buffer += ch;
+		}
+	}
+}
+
+PdfBookReader::PdfBookReader(BookModel &model) : myModelReader(model) {
+}
+
+PdfBookReader::~PdfBookReader() {
+}
+
+shared_ptr<PdfObject> PdfBookReader::readObjectFromLocation(ZLInputStream &stream, const std::pair<int,int> &address) {
+	std::map<std::pair<int,int>,int>::const_iterator jt = myObjectLocationMap.find(address);
+	if (jt == myObjectLocationMap.end()) {
+		return 0;
+	}
+	stream.seek(jt->second, true);
+	char ch = 0;
+	PdfObject::readToken(stream, myBuffer, ch);
+	if (address.first != atoi(myBuffer.c_str())) {
+		return 0;
+	}
+	PdfObject::readToken(stream, myBuffer, ch);
+	if (address.second != atoi(myBuffer.c_str())) {
+		return 0;
+	}
+	PdfObject::readToken(stream, myBuffer, ch);
+	if (myBuffer != "obj") {
+		return 0;
+	}
+	return PdfObject::readObject(stream, ch);
+}
+
+shared_ptr<PdfObject> PdfBookReader::resolveReference(shared_ptr<PdfObject> ref, ZLInputStream &stream) {
+	if (ref.isNull() || (ref->type() != PdfObject::REFERENCE)) {
+		return ref;
+	}
+	const PdfObjectReference &reference = (const PdfObjectReference&)*ref;
+	const std::pair<int,int>address(reference.number(), reference.generation());
+	std::map<std::pair<int,int>,shared_ptr<PdfObject> >::const_iterator it = myObjectMap.find(address);
+	if (it != myObjectMap.end()) {
+		return it->second;
+	}
+	std::map<std::pair<int,int>,int>::const_iterator jt = myObjectLocationMap.find(address);
+	shared_ptr<PdfObject> object = readObjectFromLocation(stream, address);
+	myObjectMap.insert(std::pair<std::pair<int,int>,shared_ptr<PdfObject> >(address, object));
+	return object;
+}
+
+static void stripBuffer(std::string &buffer) {
+	int index = buffer.find('%');
+	if (index >= 0) {
+		buffer.erase(index);
+	}
+	ZLStringUtil::stripWhiteSpaces(buffer);
+}
+
+bool PdfBookReader::readReferenceTable(ZLInputStream &stream, int xrefOffset) {
+	while (true) {
+		stream.seek(xrefOffset, true);
+		readLine(stream, myBuffer);
+		stripBuffer(myBuffer);
+		if (myBuffer != "xref") {
+			return false;
+		}
+
+		while (true) {
+			readLine(stream, myBuffer);
+			stripBuffer(myBuffer);
+			if (myBuffer == "trailer") {
+				break;
+			}
+			const int index = myBuffer.find(' ');
+			const int start = atoi(myBuffer.c_str());
+			const int len = atoi(myBuffer.c_str() + index + 1);
+			for (int i = 0; i < len; ++i) {
+				readLine(stream, myBuffer);
+				stripBuffer(myBuffer);
+				if (myBuffer.length() != 18) {
+					return false;
+				}
+				const int objectOffset = atoi(myBuffer.c_str());
+				const int objectGeneration = atoi(myBuffer.c_str() + 11);
+				const bool objectInUse = myBuffer[17] == 'n';
+				if (objectInUse) {
+					myObjectLocationMap[std::pair<int,int>(start + i, objectGeneration)] = objectOffset;
+				}
+			}
+		}
+		char ch = 0;
+		shared_ptr<PdfObject> trailer = PdfObject::readObject(stream, ch);
+		if (trailer.isNull() || (trailer->type() != PdfObject::DICTIONARY)) {
+			return false;
+		}
+		if (myTrailer.isNull()) {
+			myTrailer = trailer;
+		}
+		PdfDictionaryObject &trailerDictionary = (PdfDictionaryObject&)*trailer;
+		shared_ptr<PdfObject> previous = trailerDictionary["Prev"];
+		if (previous.isNull()) {
+			return true;
+		}
+
+		if (previous->type() != PdfObject::INTEGER_NUMBER) {
+			return false;
+		}
+		xrefOffset = ((PdfIntegerObject&)*previous).value();
+	}
+}
+
+bool PdfBookReader::readBook(shared_ptr<ZLInputStream> stream) {
+	if (stream.isNull() || !stream->open()) {
+		return false;
+	}
+
+	readLine(*stream, myBuffer);
+	if (!ZLStringUtil::stringStartsWith(myBuffer, "%PDF-")) {
+		return false;
+	}
+
+	std::string version = myBuffer.substr(5);
+	std::cerr << "version = " << version << "\n";
+
+	size_t eofOffset = stream->sizeOfOpened();
+	if (eofOffset < 100) {
+		return false;
+	}
+
+	stream->seek(eofOffset - 100, true);
+	bool readXrefOffset = false;
+	size_t xrefOffset = (size_t)-1;
+	while (true) {
+		readLine(*stream, myBuffer);
+		if (myBuffer.empty()) {
+			break;
+		}
+		stripBuffer(myBuffer);
+		if (readXrefOffset) {
+			if (!myBuffer.empty()) {
+				xrefOffset = atoi(myBuffer.c_str());
+				break;
+			}
+		} else if (myBuffer == "startxref") {
+			readXrefOffset = true;
+		}
+	}
+
+	if (!readReferenceTable(*stream, xrefOffset)) {
+		return false;
+	}
+
+	PdfDictionaryObject &trailerDictionary = (PdfDictionaryObject&)*myTrailer;
+	shared_ptr<PdfObject> root = resolveReference(trailerDictionary["Root"], *stream);
+	if (root.isNull() || (root->type() != PdfObject::DICTIONARY)) {
+		return false;
+	}
+
+	PdfDictionaryObject &rootDictionary = (PdfDictionaryObject&)*root;
+	if (rootDictionary["Type"] != PdfNameObject::nameObject("Catalog")) {
+		return false;
+	}
+	shared_ptr<PdfObject> pageRootNode = resolveReference(rootDictionary["Pages"], *stream);
+	if (pageRootNode.isNull() || (pageRootNode->type() != PdfObject::DICTIONARY)) {
+		return false;
+	}
+	PdfDictionaryObject &pageRootNodeDictionary = (PdfDictionaryObject&)*pageRootNode;
+	if (pageRootNodeDictionary["Type"] != PdfNameObject::nameObject("Pages")) {
+		return false;
+	}
+	
+	/*
+	shared_ptr<PdfObject> count = pageRootNodeDictionary["Count"];
+	if (!count.isNull() && (count->type() == PdfObject::INTEGER_NUMBER)) {
+		std::cerr << "count = " << ((PdfIntegerObject&)*count).value() << "\n";
+	}
+	*/
+	shared_ptr<PdfObject> pages = pageRootNodeDictionary["Kids"];
+	if (pages.isNull() || (pages->type() != PdfObject::ARRAY)) {
+		return false;
+	}
+	const PdfArrayObject& pagesArray = (const PdfArrayObject&)*pages;
+	const size_t pageNumber = pagesArray.size();
+	for (size_t i = 0; i < pageNumber; ++i) {
+		processPage(pagesArray[i], *stream);
+	}
+
+	return true;
+}
+
+void PdfBookReader::processContents(shared_ptr<PdfObject> contentsObject, ZLInputStream &stream) {
+	contentsObject = resolveReference(contentsObject, stream);
+}
+
+void PdfBookReader::processPage(shared_ptr<PdfObject> pageObject, ZLInputStream &stream) {
+	pageObject = resolveReference(pageObject, stream);
+	if (pageObject.isNull() || pageObject->type() != PdfObject::DICTIONARY) {
+		return;
+	}
+	const PdfDictionaryObject &pageDictionary = (const PdfDictionaryObject&)*pageObject;
+	shared_ptr<PdfObject> contents = pageDictionary["Contents"];
+	if (contents.isNull()) {
+		return;
+	}
+	switch (contents->type()) {
+		default:
+			break;
+		case PdfObject::REFERENCE:
+			processContents(contents, stream);
+			break;
+		case PdfObject::ARRAY:
+		{
+			const PdfArrayObject &array = (const PdfArrayObject&)*contents;
+			const size_t len = array.size();
+			for (size_t i = 0; i < len; ++i) {
+				processContents(array[i], stream);
+			}
+			break;
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfBookReader.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __PdfBOOKREADER_H__
+#define __PdfBOOKREADER_H__
+
+#include <map>
+
+#include "../../bookmodel/BookReader.h"
+
+class PdfObject;
+class PdfObjectReference;
+
+class PdfBookReader {
+
+public:
+	PdfBookReader(BookModel &model);
+	~PdfBookReader();
+	bool readBook(shared_ptr<ZLInputStream> stream);
+
+private:
+	bool readReferenceTable(ZLInputStream &stream, int offset);
+	shared_ptr<PdfObject> resolveReference(shared_ptr<PdfObject> reference, ZLInputStream &stream);
+	shared_ptr<PdfObject> readObjectFromLocation(ZLInputStream &stream, const std::pair<int,int> &address);
+	void processPage(shared_ptr<PdfObject> pageObject, ZLInputStream &stream);
+	void processContents(shared_ptr<PdfObject> contentsObject, ZLInputStream &stream);
+
+private:
+	BookReader myModelReader;
+	std::string myBuffer;
+	std::map<std::pair<int,int>,int> myObjectLocationMap;
+	std::map<std::pair<int,int>,shared_ptr<PdfObject> > myObjectMap;
+	shared_ptr<PdfObject> myTrailer;
+};
+
+#endif /* __PdfBOOKREADER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfDescriptionReader.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLInputStream.h>
+
+#include "PdfDescriptionReader.h"
+
+PdfDescriptionReader::PdfDescriptionReader(BookDescription &description) : myDescription(description) {
+}
+
+bool PdfDescriptionReader::readDescription(shared_ptr<ZLInputStream> stream) {
+	return true;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfDescriptionReader.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __PDFDESCRIPTIONREADER_H__
+#define __PDFDESCRIPTIONREADER_H__
+
+#include <string>
+
+#include "../../description/BookDescription.h"
+
+class PdfDescriptionReader {
+
+public:
+	PdfDescriptionReader(BookDescription &description);
+	~PdfDescriptionReader();
+	bool readDescription(shared_ptr<ZLInputStream> stream);
+
+private:
+	WritableBookDescription myDescription;
+};
+
+inline PdfDescriptionReader::~PdfDescriptionReader() {}
+
+#endif /* __PDFDESCRIPTIONREADER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfObject.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfObject.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfObject.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfObject.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,450 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <iostream>
+
+#include <ZLInputStream.h>
+#include <ZLZDecompressor.h>
+
+#include "PdfObject.h"
+
+PdfObject::~PdfObject() {
+}
+
+shared_ptr<PdfObject> PdfIntegerObject::integerObject(int value) {
+	if ((value < 0) || (value >= 256)) {
+		return new PdfIntegerObject(value);
+	} else {
+		static shared_ptr<PdfObject>* table = new shared_ptr<PdfObject>[256];
+		if (table[value].isNull()) {
+			table[value] = new PdfIntegerObject(value);
+		}
+		return table[value];
+	}
+}
+
+PdfIntegerObject::PdfIntegerObject(int value) : myValue(value) {
+	std::cerr << "PdfIntegerObject " << value << "\n";
+}
+
+int PdfIntegerObject::value() const {
+	return myValue;
+}
+
+PdfObject::Type PdfIntegerObject::type() const {
+	return INTEGER_NUMBER;
+}
+
+shared_ptr<PdfObject> PdfBooleanObject::TRUE() {
+	static shared_ptr<PdfObject> value = new PdfBooleanObject(true);
+	return value;
+}
+
+shared_ptr<PdfObject> PdfBooleanObject::FALSE() {
+	static shared_ptr<PdfObject> value = new PdfBooleanObject(false);
+	return value;
+}
+
+PdfBooleanObject::PdfBooleanObject(bool value) : myValue(value) {
+	std::cerr << "PdfBooleanObject " << value << "\n";
+}
+
+bool PdfBooleanObject::value() const {
+	return myValue;
+}
+
+PdfObject::Type PdfBooleanObject::type() const {
+	return BOOLEAN;
+}
+
+PdfStringObject::PdfStringObject(const std::string &value) : myValue(value) {
+	std::cerr << "PdfStringObject " << value << "\n";
+}
+
+PdfObject::Type PdfStringObject::type() const {
+	return STRING;
+}
+
+std::map<std::string,shared_ptr<PdfObject> > PdfNameObject::ourObjectMap;
+
+shared_ptr<PdfObject> PdfNameObject::nameObject(const std::string &id) {
+	// TODO: process escaped characters
+	std::map<std::string,shared_ptr<PdfObject> >::const_iterator it = ourObjectMap.find(id);
+	if (it != ourObjectMap.end()) {
+		return it->second;
+	}
+	std::cerr << "PdfNameObject " << id << "\n";
+	shared_ptr<PdfObject> object = new PdfNameObject();
+	ourObjectMap.insert(std::pair<std::string,shared_ptr<PdfObject> >(id, object));
+	return object;
+}
+
+PdfNameObject::PdfNameObject() {
+}
+
+PdfObject::Type PdfNameObject::type() const {
+	return NAME;
+}
+
+PdfDictionaryObject::PdfDictionaryObject() {
+}
+
+void PdfDictionaryObject::setObject(shared_ptr<PdfObject> id, shared_ptr<PdfObject> object) {
+	myMap[id] = object;
+}
+
+shared_ptr<PdfObject> PdfDictionaryObject::operator[](shared_ptr<PdfObject> id) const {
+	std::map<shared_ptr<PdfObject>,shared_ptr<PdfObject> >::const_iterator it = myMap.find(id);
+	return (it != myMap.end()) ? it->second : 0;
+}
+
+shared_ptr<PdfObject> PdfDictionaryObject::operator[](const std::string &id) const {
+	return operator[](PdfNameObject::nameObject(id));
+}
+
+PdfObject::Type PdfDictionaryObject::type() const {
+	return DICTIONARY;
+}
+
+PdfArrayObject::PdfArrayObject() {
+}
+
+void PdfArrayObject::addObject(shared_ptr<PdfObject> object) {
+	myVector.push_back(object);
+}
+
+shared_ptr<PdfObject> PdfArrayObject::popLast() {
+	if (!myVector.empty()) {
+		shared_ptr<PdfObject> last = myVector.back();
+		myVector.pop_back();
+		return last;
+	}
+	return 0;
+}
+
+int PdfArrayObject::size() const {
+	return myVector.size();
+}
+
+shared_ptr<PdfObject> PdfArrayObject::operator[](int index) const {
+	return myVector[index];
+}
+
+PdfObject::Type PdfArrayObject::type() const {
+	return ARRAY;
+}
+
+PdfObjectReference::PdfObjectReference(int number, int generation) : myNumber(number), myGeneration(generation) {
+}
+
+int PdfObjectReference::number() const {
+	return myNumber;
+}
+
+int PdfObjectReference::generation() const {
+	return myGeneration;
+}
+
+PdfObject::Type PdfObjectReference::type() const {
+	return REFERENCE;
+}
+
+PdfStreamObject::PdfStreamObject(const PdfDictionaryObject &dictionary, ZLInputStream &dataStream) {
+	char ch;
+	skipWhiteSpaces(dataStream, ch);
+
+	shared_ptr<PdfObject> length = dictionary["Length"];
+	if (!length.isNull() && (length->type() == INTEGER_NUMBER)) {
+		int value = ((PdfIntegerObject&)*length).value();
+		if (value > 0) {
+			shared_ptr<PdfObject> filter = dictionary["Filter"];
+			if (filter == PdfNameObject::nameObject("FlateDecode")) {
+				dataStream.seek(1, false);
+				ZLZDecompressor decompressor(value - 2);
+				char buffer[2048];
+				while (true) {
+					size_t size = decompressor.decompress(dataStream, buffer, 2048);
+					if (size == 0) {
+						break;
+					}
+					myData.append(buffer, size);
+				}
+				std::cerr << myData << "\n";
+			} else {
+				myData.append(value, '\0');
+				myData[0] = ch;
+				dataStream.read((char*)myData.data() + 1, value - 1);
+			}
+		}
+	}
+
+	/*
+	shared_ptr<PdfObject> filter = dictionary["Filter"];
+	if (!filter.isNull()) {
+		switch (filter->type()) {
+			default:
+				break;
+			case NAME:
+				myFilters.push_back(
+					(filter == PdfNameObject::nameObject("FlateDecode")) ?
+						FLATE : UNKNOWN
+				);
+				break;
+			case ARRAY:
+			{
+				// TODO: process filters array
+			}
+		}
+	}
+	*/
+}
+
+PdfObject::Type PdfStreamObject::type() const {
+	return STREAM;
+}
+
+enum PdfCharacterType {
+	PDF_CHAR_REGULAR,
+	PDF_CHAR_WHITESPACE,
+	PDF_CHAR_DELIMITER
+};
+
+static PdfCharacterType *PdfCharacterTypeTable = 0;
+
+void PdfObject::skipWhiteSpaces(ZLInputStream &stream, char &ch) {
+	if (PdfCharacterTypeTable == 0) {
+		PdfCharacterTypeTable = new PdfCharacterType[256];
+		for (int i = 0; i < 256; ++i) {
+			PdfCharacterTypeTable[i] = PDF_CHAR_REGULAR;
+		}
+		PdfCharacterTypeTable[0] = PDF_CHAR_WHITESPACE;
+		PdfCharacterTypeTable[9] = PDF_CHAR_WHITESPACE;
+		PdfCharacterTypeTable[10] = PDF_CHAR_WHITESPACE;
+		PdfCharacterTypeTable[12] = PDF_CHAR_WHITESPACE;
+		PdfCharacterTypeTable[13] = PDF_CHAR_WHITESPACE;
+		PdfCharacterTypeTable[32] = PDF_CHAR_WHITESPACE;
+		PdfCharacterTypeTable['('] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable[')'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['<'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['>'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['['] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable[']'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['{'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['}'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['/'] = PDF_CHAR_DELIMITER;
+		PdfCharacterTypeTable['%'] = PDF_CHAR_DELIMITER;
+	}
+
+	while ((PdfCharacterTypeTable[(unsigned char)ch] == PDF_CHAR_WHITESPACE) &&
+				 (stream.read(&ch, 1) == 1)) {
+	}
+}
+
+void PdfObject::readToken(ZLInputStream &stream, std::string &buffer, char &ch) {
+	buffer.clear();
+	skipWhiteSpaces(stream, ch);
+	while (PdfCharacterTypeTable[(unsigned char)ch] == PDF_CHAR_REGULAR) {
+		buffer += ch;
+		if (stream.read(&ch, 1) != 1) {
+			break;
+		}
+	}
+}
+
+shared_ptr<PdfObject> PdfObject::readObject(ZLInputStream &stream, char &ch) {
+	skipWhiteSpaces(stream, ch);
+
+	PdfObject::Type type = PdfObject::NIL;
+	bool hexString = false;
+	switch (ch) {
+		case '(':
+			hexString = false;
+			type = PdfObject::STRING;
+			break;
+		case '<':
+			stream.read(&ch, 1);
+			hexString = true;
+			type = (ch == '<') ? PdfObject::DICTIONARY : PdfObject::STRING;
+			break;
+		case '>': // end of dictionary
+			stream.read(&ch, 1);
+			if (ch == '>') {
+				stream.read(&ch, 1);
+			}
+			return 0;
+		case '/':
+			type = PdfObject::NAME;
+			break;
+		case '[':
+			type = PdfObject::ARRAY;
+			break;
+		case ']': // end of array
+			stream.read(&ch, 1);
+			return 0;
+		case '+':
+		case '-':
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			type = PdfObject::INTEGER_NUMBER;
+			break;
+		case 't':
+		case 'f':
+			type = PdfObject::BOOLEAN;
+			break;
+	}
+
+	switch (type) {
+		case PdfObject::DICTIONARY:
+		{
+			ch = 0;
+			shared_ptr<PdfObject> name;
+			shared_ptr<PdfObject> value;
+			shared_ptr<PdfObject> next;
+			PdfDictionaryObject *dictionary = new PdfDictionaryObject();
+			while (true) {
+				next = readObject(stream, ch);
+				if (next.isNull()) {
+					break;
+				}
+				PdfObject::Type oType = next->type();
+				if (oType == PdfObject::NAME) {
+					name = next;
+					value = readObject(stream, ch);
+					if (value.isNull()) {
+						break;
+					}
+					dictionary->setObject(name, value);
+				} else if (oType == PdfObject::INTEGER_NUMBER) {
+					if (value.isNull() || (value->type() != PdfObject::INTEGER_NUMBER)) {
+						break;
+					}
+					skipWhiteSpaces(stream, ch);
+					if (ch != 'R') {
+						break;
+					}
+					const int number = ((PdfIntegerObject&)*value).value();
+					const int generation = ((PdfIntegerObject&)*next).value();
+					dictionary->setObject(name, new PdfObjectReference(number, generation));
+					value = 0;
+					ch = 0;
+				} else {
+					break;
+				}
+			}
+			std::string token;
+			readToken(stream, token, ch);
+			if (token == "stream") {
+				shared_ptr<PdfObject> d = dictionary;
+				return new PdfStreamObject(*dictionary, stream);
+			} else {
+				return dictionary;
+			}
+		}
+		case PdfObject::NAME:
+		{
+			std::string name;
+			stream.read(&ch, 1);
+			readToken(stream, name, ch);
+			return PdfNameObject::nameObject(name);
+		}
+		case PdfObject::BOOLEAN:
+		{
+			std::string name;
+			readToken(stream, name, ch);
+			return (name == "true") ? PdfBooleanObject::TRUE() : PdfBooleanObject::FALSE();
+		}
+		case PdfObject::INTEGER_NUMBER:
+		{
+			std::string str;
+			if ((ch == '+') || (ch == '-')) {
+				str += ch;
+				stream.read(&ch, 1);
+			}
+			while ((ch >= '0') && (ch <= '9')) {
+				str += ch;
+				stream.read(&ch, 1);
+			}
+			return PdfIntegerObject::integerObject(atoi(str.c_str()));
+		}
+		case PdfObject::STRING:
+		{
+			std::string value;
+			if (hexString) {
+				char num[3];
+				num[2] = '\0';
+				while (ch != '>') {
+					num[0] = ch;
+					stream.read(num + 1, 1);
+					value += (char)strtol(num, 0, 16);
+					stream.read(&ch, 1);
+				}
+				ch = 0;
+			} else {
+				// TODO: implement
+			}
+			return new PdfStringObject(value);
+		}
+		case PdfObject::ARRAY:
+		{
+			PdfArrayObject *array = new PdfArrayObject();
+			ch = 0;
+			while (true) {
+				skipWhiteSpaces(stream, ch);
+				if (ch == 'R') {
+					const int size = array->size();
+					if ((size >= 2) &&
+							((*array)[size - 1]->type() == PdfObject::INTEGER_NUMBER) &&
+							((*array)[size - 2]->type() == PdfObject::INTEGER_NUMBER)) {
+						const int generation = ((PdfIntegerObject&)*array->popLast()).value();
+						const int number = ((PdfIntegerObject&)*array->popLast()).value();
+						array->addObject(new PdfObjectReference(number, generation));
+						ch = 0;
+					}
+				}
+				shared_ptr<PdfObject> object = readObject(stream, ch);
+				if (object.isNull()) {
+					break;
+				}
+				array->addObject(object);
+			}
+			std::cerr << "PdfArrayObject " << array->size() << "\n";
+			return array;
+		}
+		default:
+			break;
+	}
+
+	std::string buffer;
+	stream.read(&ch, 1);
+	while (PdfCharacterTypeTable[(unsigned char)ch] == PDF_CHAR_REGULAR) {
+		buffer += ch;
+		stream.read(&ch, 1);
+	}
+	std::cerr << "buffer = " << buffer << "\n";
+
+	return 0;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfObject.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfObject.h
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfObject.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfObject.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __PDFOBJECT_H__
+#define __PDFOBJECT_H__
+
+#include <string>
+#include <vector>
+#include <map>
+
+#include <shared_ptr.h>
+
+class ZLInputStream;
+
+class PdfObject {
+
+public:
+	static shared_ptr<PdfObject> readObject(ZLInputStream &stream, char &ch);
+	static void readToken(ZLInputStream &stream, std::string &buffer, char &ch);
+
+protected:
+	static void skipWhiteSpaces(ZLInputStream &stream, char &ch);
+
+public:
+	enum Type {
+		BOOLEAN,
+		INTEGER_NUMBER,
+		REAL_NUMBER,
+		STRING,
+		NAME,
+		ARRAY,
+		DICTIONARY,
+		STREAM,
+		NIL,
+		REFERENCE
+	};
+
+	virtual ~PdfObject();
+
+	virtual Type type() const = 0;
+};
+
+class PdfBooleanObject : public PdfObject {
+
+public:
+	static shared_ptr<PdfObject> TRUE();
+	static shared_ptr<PdfObject> FALSE();
+
+private:
+	PdfBooleanObject(bool value);
+
+public:
+	bool value() const;
+
+private:
+	Type type() const;
+
+private:
+	const bool myValue;
+};
+
+class PdfIntegerObject : public PdfObject {
+
+public:
+	static shared_ptr<PdfObject> integerObject(int value);
+
+private:
+	PdfIntegerObject(int value);
+
+public:
+	int value() const;
+
+private:
+	Type type() const;
+
+private:
+	const int myValue;
+};
+
+class PdfStringObject : public PdfObject {
+
+private:
+	PdfStringObject(const std::string &value);
+
+private:
+	Type type() const;
+
+private:
+	std::string myValue;
+
+friend shared_ptr<PdfObject> PdfObject::readObject(ZLInputStream &stream, char &ch);
+};
+
+class PdfNameObject : public PdfObject {
+
+public:
+	static shared_ptr<PdfObject> nameObject(const std::string &id);
+
+private:
+	static std::map<std::string,shared_ptr<PdfObject> > ourObjectMap;
+
+private:
+	PdfNameObject();
+
+private:
+	Type type() const;
+};
+
+class PdfDictionaryObject : public PdfObject {
+
+private:
+	PdfDictionaryObject();
+	void setObject(shared_ptr<PdfObject> id, shared_ptr<PdfObject> object);
+
+public:
+	shared_ptr<PdfObject> operator[](shared_ptr<PdfObject> id) const;
+	shared_ptr<PdfObject> operator[](const std::string &id) const;
+
+private:
+	Type type() const;
+
+private:
+	std::map<shared_ptr<PdfObject>,shared_ptr<PdfObject> > myMap;
+
+friend shared_ptr<PdfObject> PdfObject::readObject(ZLInputStream &stream, char &ch);
+};
+
+class PdfStreamObject : public PdfObject {
+
+private:
+	PdfStreamObject(const PdfDictionaryObject &dictionary, ZLInputStream &dataStream);
+
+private:
+	Type type() const;
+
+private:
+	std::string myData;
+	/*
+	enum EncodingType {
+		UNKNOWN,
+		FLATE,
+	};
+	std::vector<EncodingType> myFilters;
+	*/
+
+friend shared_ptr<PdfObject> PdfObject::readObject(ZLInputStream &stream, char &ch);
+};
+
+class PdfArrayObject : public PdfObject {
+
+private:
+	PdfArrayObject();
+	void addObject(shared_ptr<PdfObject> object);
+	shared_ptr<PdfObject> popLast();
+
+public:
+	int size() const;
+	shared_ptr<PdfObject> operator[](int index) const;
+
+private:
+	Type type() const;
+
+private:
+	std::vector<shared_ptr<PdfObject> > myVector;
+
+friend shared_ptr<PdfObject> PdfObject::readObject(ZLInputStream &stream, char &ch);
+};
+
+class PdfObjectReference : public PdfObject {
+
+public:
+	PdfObjectReference(int number, int generation);
+
+	int number() const;
+	int generation() const;
+
+private:
+	Type type() const;
+
+private:
+	const int myNumber;
+	const int myGeneration;
+};
+
+#endif /* __PDFOBJECT_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfPlugin.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLFile.h>
+#include <ZLInputStream.h>
+
+#include "PdfPlugin.h"
+#include "PdfDescriptionReader.h"
+#include "PdfBookReader.h"
+#include "../../description/BookDescription.h"
+
+bool PdfPlugin::acceptsFile(const ZLFile &file) const {
+	return file.extension() == "pdf";
+}
+
+bool PdfPlugin::readDescription(const std::string &path, BookDescription &description) const {
+	return PdfDescriptionReader(description).readDescription(ZLFile(path).inputStream());
+}
+
+bool PdfPlugin::readModel(const BookDescription &description, BookModel &model) const {
+	return PdfBookReader(model).readBook(ZLFile(description.fileName()).inputStream());
+}
+
+const std::string &PdfPlugin::iconName() const {
+	static const std::string ICON_NAME = "unknown";
+	return ICON_NAME;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/PdfPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/pdf/PdfPlugin.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/PdfPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __PdfPLUGIN_H__
+#define __PdfPLUGIN_H__
+
+#include "../FormatPlugin.h"
+
+class PdfPlugin : public FormatPlugin {
+
+public:
+	PdfPlugin();
+	~PdfPlugin();
+	bool providesMetaInfo() const;
+	bool acceptsFile(const ZLFile &file) const;
+	bool readDescription(const std::string &path, BookDescription &description) const;
+	bool readModel(const BookDescription &description, BookModel &model) const;
+	const std::string &iconName() const;
+};
+
+inline PdfPlugin::PdfPlugin() {}
+inline PdfPlugin::~PdfPlugin() {}
+inline bool PdfPlugin::providesMetaInfo() const { return true; }
+
+#endif /* __PdfPLUGIN_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/StringStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/StringStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/pdf/StringStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/StringStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <algorithm>
+
+#include "StringStream.h"
+
+StringStream::StringStream(const std::string &data) : myData(data), myOffset(0) {
+}
+
+bool StringStream::open() {
+	myOffset = 0;
+	return true;
+}
+
+size_t StringStream::read(char *buffer, size_t maxSize) {
+	size_t size = std::min(maxSize, myData.length() - myOffset);
+	memcpy(buffer, myData.data() + myOffset, size);
+	myOffset += size;
+	return size;
+}
+
+void StringStream::close() {
+}
+
+void StringStream::seek(int offset, bool absoluteOffset) {
+	if (!absoluteOffset) {
+		offset += myOffset;
+	}
+	myOffset = std::min((size_t)std::max(0, offset), myData.length());
+}
+
+size_t StringStream::offset() const {
+	return myOffset;
+}
+
+size_t StringStream::sizeOfOpened() {
+	return myData.length();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/pdf/StringStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/pdf/StringStream.h
--- fbreader-0.8.17/fbreader/src/formats/pdf/StringStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/pdf/StringStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __STRINGSTREAM_H__
+#define __STRINGSTREAM_H__
+
+#include <ZLInputStream.h>
+
+class StringStream : public ZLInputStream {
+
+public:
+	StringStream(const std::string &data);
+
+public:
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	const std::string &myData;
+	size_t myOffset;
+};
+
+#endif /* __STRINGSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/PluginCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/PluginCollection.cpp
--- fbreader-0.8.17/fbreader/src/formats/PluginCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/PluginCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  * 02110-1301, USA.
  */
 
+#include <ZLibrary.h>
 #include <ZLStringUtil.h>
 
 #include "FormatPlugin.h"
@@ -31,6 +32,7 @@
 #include "chm/CHMPlugin.h"
 #include "rtf/RtfPlugin.h"
 #include "openreader/OpenReaderPlugin.h"
+//#include "pdf/PdfPlugin.h"
 
 PluginCollection *PluginCollection::ourInstance = 0;
 
@@ -50,6 +52,7 @@
 		ourInstance->myPlugins.push_back(new OEBPlugin());
 		ourInstance->myPlugins.push_back(new RtfPlugin());
 		ourInstance->myPlugins.push_back(new OpenReaderPlugin());
+		//ourInstance->myPlugins.push_back(new PdfPlugin());
 	}
 	return *ourInstance;
 }
@@ -63,8 +66,8 @@
 
 PluginCollection::PluginCollection() :
 	LanguageAutoDetectOption(ZLCategoryKey::CONFIG, "Format", "AutoDetect", true),
-	DefaultLanguageOption(ZLCategoryKey::CONFIG, "Format", "DefaultLanguageS", "en"),
-	DefaultEncodingOption(ZLCategoryKey::CONFIG, "Format", "DefaultEncoding", "windows-1252") {
+	DefaultLanguageOption(ZLCategoryKey::CONFIG, "Format", "DefaultLanguageS", ZLibrary::Language()),
+	DefaultEncodingOption(ZLCategoryKey::CONFIG, "Format", "DefaultEncoding", "UTF-8") {
 }
 
 PluginCollection::~PluginCollection() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -222,7 +222,7 @@
 }
 
 void RtfBookReader::setAlignment() {
-	ZLTextForcedControlEntry entry;
+	ZLTextStyleEntry entry;
 	entry.setAlignmentType(myState.Alignment);
 	myBookReader.addControl(entry);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfDescriptionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfDescriptionReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfDescriptionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfDescriptionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfDescriptionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfDescriptionReader.h
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfDescriptionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfDescriptionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfImage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfImage.cpp
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfImage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfImage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfImage.h
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,6 @@
  * 02110-1301, USA.
  */
 
-#include <ZLTime.h>
-
 #include <ZLStringUtil.h>
 #include <ZLFile.h>
 #include <ZLInputStream.h>
@@ -33,8 +31,7 @@
 }
 
 bool RtfPlugin::acceptsFile(const ZLFile &file) const {
-	const std::string &extension = file.extension();
-	return (extension == "rtf");
+	return file.extension() == "rtf";
 }
 
 bool RtfPlugin::readDescription(const std::string &path, BookDescription &description) const {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/rtf/RtfReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfReader.h
--- fbreader-0.8.17/fbreader/src/formats/rtf/RtfReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/rtf/RtfReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/tcr/PPLBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/tcr/PPLBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/tcr/PPLBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/tcr/PPLBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/tcr/PPLBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/tcr/PPLBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/tcr/PPLBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/tcr/PPLBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/tcr/TcrPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/tcr/TcrPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@
 #include "../txt/PlainTextFormat.h"
 
 bool TcrPlugin::acceptsFile(const ZLFile &file) const {
-	return (file.extension() == "tcr") || (file.extension() == "TCR");
+	return file.extension() == "tcr";
 }
 
 bool TcrPlugin::readDescription(const std::string &path, BookDescription &description) const {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/tcr/TcrPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/tcr/TcrPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/tcr/TcrStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/tcr/TcrStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/tcr/TcrStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrStream.h
--- fbreader-0.8.17/fbreader/src/formats/tcr/TcrStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/tcr/TcrStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/PlainTextFormat.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/PlainTextFormat.cpp
--- fbreader-0.8.17/fbreader/src/formats/txt/PlainTextFormat.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/PlainTextFormat.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/PlainTextFormat.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/PlainTextFormat.h
--- fbreader-0.8.17/fbreader/src/formats/txt/PlainTextFormat.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/PlainTextFormat.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/TxtBookReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtBookReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/txt/TxtBookReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtBookReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/TxtBookReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtBookReader.h
--- fbreader-0.8.17/fbreader/src/formats/txt/TxtBookReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtBookReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/TxtPlugin.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtPlugin.cpp
--- fbreader-0.8.17/fbreader/src/formats/txt/TxtPlugin.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtPlugin.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 }
 
 bool TxtPlugin::acceptsFile(const ZLFile &file) const {
-	return (file.extension() == "txt") || (file.extension() == "TXT");
+	return file.extension() == "txt";
 }
 
 bool TxtPlugin::readDescription(const std::string &path, BookDescription &description) const {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/TxtPlugin.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtPlugin.h
--- fbreader-0.8.17/fbreader/src/formats/txt/TxtPlugin.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtPlugin.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/TxtReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/txt/TxtReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/txt/TxtReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtReader.h
--- fbreader-0.8.17/fbreader/src/formats/txt/TxtReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/txt/TxtReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/EntityFilesCollector.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/EntityFilesCollector.cpp
--- fbreader-0.8.17/fbreader/src/formats/util/EntityFilesCollector.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/EntityFilesCollector.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/EntityFilesCollector.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/EntityFilesCollector.h
--- fbreader-0.8.17/fbreader/src/formats/util/EntityFilesCollector.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/EntityFilesCollector.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/MergedStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/MergedStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/util/MergedStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/MergedStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "MergedStream.h"
+
+bool MergedStream::open() {
+	close();
+	resetToStart();
+	myOffset = 0;
+	myCurrentStream = nextStream();
+	return !myCurrentStream.isNull() && myCurrentStream->open();
+}
+
+size_t MergedStream::read(char *buffer, size_t maxSize) {
+	size_t bytesToRead = maxSize;
+	while ((bytesToRead > 0) && !myCurrentStream.isNull()) {
+		size_t len = myCurrentStream->read(buffer, bytesToRead);
+		bytesToRead -= len;
+		if (buffer != 0) {
+			buffer += len;
+		}
+		if (bytesToRead != 0) {
+			if (buffer != 0) {
+				*buffer++ = '\n';
+			}
+			bytesToRead--;
+			myCurrentStream = nextStream();
+			if (myCurrentStream.isNull() || !myCurrentStream->open()) {
+				break;
+			}
+		}
+	}
+	myOffset += maxSize - bytesToRead;
+	return maxSize - bytesToRead;
+}
+
+void MergedStream::close() {
+	myCurrentStream.reset();
+}
+
+void MergedStream::seek(int offset, bool absoluteOffset) {
+	// works for nonnegative offsets only
+	if (absoluteOffset) {
+		offset -= myOffset;
+	}
+	read(0, offset);
+}
+
+size_t MergedStream::offset() const {
+	return myOffset;
+}
+
+size_t MergedStream::sizeOfOpened() {
+	// coudn't be implemented
+	return 0;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/MergedStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/MergedStream.h
--- fbreader-0.8.17/fbreader/src/formats/util/MergedStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/MergedStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __MERGEDSTREAM_H__
+#define __MERGEDSTREAM_H__
+
+#include <shared_ptr.h>
+#include <ZLInputStream.h>
+
+class MergedStream : public ZLInputStream {
+
+protected:
+	virtual shared_ptr<ZLInputStream> nextStream() = 0;
+	virtual void resetToStart() = 0;
+
+private:
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	shared_ptr<ZLInputStream> myCurrentStream;
+	size_t myOffset;
+};
+
+#endif /* __MERGEDSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/MiscUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/MiscUtil.cpp
--- fbreader-0.8.17/fbreader/src/formats/util/MiscUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/MiscUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,12 +25,25 @@
 
 #include "MiscUtil.h"
 
-bool MiscUtil::isReference(const std::string &text) {
-	return
-		ZLStringUtil::stringStartsWith(text, "http://") ||
-		ZLStringUtil::stringStartsWith(text, "https://") ||
-		ZLStringUtil::stringStartsWith(text, "mailto:") ||
-		ZLStringUtil::stringStartsWith(text, "ftp://");
+FBTextKind MiscUtil::referenceType(const std::string &link) {
+	std::string lowerCasedLink = link;
+	bool isFileReference =
+		ZLStringUtil::stringStartsWith(lowerCasedLink, "http://") ||
+		ZLStringUtil::stringStartsWith(lowerCasedLink, "https://") ||
+		ZLStringUtil::stringStartsWith(lowerCasedLink, "ftp://");
+	if (!isFileReference) {
+		return ZLStringUtil::stringStartsWith(lowerCasedLink, "mailto:") ? EXTERNAL_HYPERLINK : INTERNAL_HYPERLINK;
+	}
+	static const std::string FeedBooksPrefix0 = "http://feedbooks.com/book/stanza/";
+	static const std::string FeedBooksPrefix1 = "http://www.feedbooks.com/book/stanza/";
+	bool isBookHyperlink =
+		ZLStringUtil::stringStartsWith(lowerCasedLink, FeedBooksPrefix0) ||
+		ZLStringUtil::stringStartsWith(lowerCasedLink, FeedBooksPrefix1) ||
+		ZLStringUtil::stringEndsWith(lowerCasedLink, ".epub") ||
+		ZLStringUtil::stringEndsWith(lowerCasedLink, ".mobi") ||
+		ZLStringUtil::stringEndsWith(lowerCasedLink, ".chm") ||
+		ZLStringUtil::stringEndsWith(lowerCasedLink, ".fb2");
+	return isBookHyperlink ? BOOK_HYPERLINK : EXTERNAL_HYPERLINK;
 }
 
 std::string MiscUtil::htmlDirectoryPrefix(const std::string &fileName) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/MiscUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/MiscUtil.h
--- fbreader-0.8.17/fbreader/src/formats/util/MiscUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/MiscUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,13 +22,15 @@
 
 #include <string>
 
+#include "../../bookmodel/FBTextKind.h"
+
 class MiscUtil {
 
 private:
 	MiscUtil();
 
 public:
-	static bool isReference(const std::string &text);
+	static FBTextKind referenceType(const std::string &link);
 	static std::string htmlDirectoryPrefix(const std::string &fileName);
 	static std::string htmlFileName(const std::string &fileName);
 	static std::string decodeHtmlURL(const std::string &encodedURL);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/TextFormatDetector.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/TextFormatDetector.cpp
--- fbreader-0.8.17/fbreader/src/formats/util/TextFormatDetector.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/TextFormatDetector.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/TextFormatDetector.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/TextFormatDetector.h
--- fbreader-0.8.17/fbreader/src/formats/util/TextFormatDetector.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/TextFormatDetector.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/XMLTextStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/XMLTextStream.cpp
--- fbreader-0.8.17/fbreader/src/formats/util/XMLTextStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/XMLTextStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <string.h>
+
+#include <ZLXMLReader.h>
+#include <ZLUnicodeUtil.h>
+
+#include "XMLTextStream.h"
+
+class XMLTextReader : public ZLXMLReader {
+
+public:
+	XMLTextReader(std::string &buffer, const std::string &startTag);
+
+private:
+	void startElementHandler(const char *tag, const char **attributes);
+	void characterDataHandler(const char *text, size_t len);
+
+private:
+	const std::string myStartTag;
+	std::string &myBuffer;
+	bool myStarted;
+};
+
+XMLTextReader::XMLTextReader(std::string &buffer, const std::string &startTag) : myStartTag(ZLUnicodeUtil::toLower(startTag)), myBuffer(buffer), myStarted(myStartTag.empty()) {
+}
+
+void XMLTextReader::startElementHandler(const char *tag, const char **attributes) {
+	if (!myStarted && (myStartTag == ZLUnicodeUtil::toLower(tag))) {
+		myStarted = true;
+	}
+}
+
+void XMLTextReader::characterDataHandler(const char *text, size_t len) {
+	if (myStarted) {
+		myBuffer.append(text, len);
+	}
+}
+
+XMLTextStream::XMLTextStream(shared_ptr<ZLInputStream> base, const std::string &startTag) : myBase(base), myStreamBuffer(2048, '\0') {
+	myReader = new XMLTextReader(myDataBuffer, startTag);
+}
+
+XMLTextStream::~XMLTextStream() {
+}
+
+bool XMLTextStream::open() {
+	close();
+	if (myBase.isNull() || !myBase->open()) {
+		return false;
+	}
+	myReader->initialize();
+	myOffset = 0;
+	return true;
+}
+
+size_t XMLTextStream::read(char *buffer, size_t maxSize) {
+	while (myDataBuffer.size() < maxSize) {
+		size_t len = myBase->read((char*)myStreamBuffer.data(), 2048);
+		if ((len == 0) || !myReader->readFromBuffer(myStreamBuffer.data(), len)) {
+			break;
+		}
+	}
+	size_t realSize = std::min(myDataBuffer.size(), maxSize);
+	if (buffer != 0) {
+		memcpy(buffer, myDataBuffer.data(), realSize);
+	}
+	myDataBuffer.erase(0, realSize);
+	myOffset += realSize;
+	return realSize;
+}
+
+void XMLTextStream::close() {
+	myReader->shutdown();
+	myBase->close();
+	myDataBuffer.erase();
+}
+
+void XMLTextStream::seek(int offset, bool absoluteOffset) {
+	// works for nonnegative offsets only
+	if (absoluteOffset) {
+		offset -= myOffset;
+	}
+	read(0, offset);
+}
+
+size_t XMLTextStream::offset() const {
+	return myOffset;
+}
+
+size_t XMLTextStream::sizeOfOpened() {
+	// couldn't be implemented
+	return 0;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/util/XMLTextStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/util/XMLTextStream.h
--- fbreader-0.8.17/fbreader/src/formats/util/XMLTextStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/formats/util/XMLTextStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __XMLTEXTSTREAM_H__
+#define __XMLTEXTSTREAM_H__
+
+#include <shared_ptr.h>
+#include <ZLInputStream.h>
+
+class XMLTextReader;
+
+class XMLTextStream : public ZLInputStream {
+
+public:
+	XMLTextStream(shared_ptr<ZLInputStream> base, const std::string &startTag);
+	~XMLTextStream();
+
+private:
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	shared_ptr<ZLInputStream> myBase;
+	shared_ptr<XMLTextReader> myReader;
+	std::string myStreamBuffer;
+	std::string myDataBuffer;
+	size_t myOffset;
+};
+
+#endif /* __XMLTEXTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/xhtml/XHTMLReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/xhtml/XHTMLReader.cpp
--- fbreader-0.8.17/fbreader/src/formats/xhtml/XHTMLReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/xhtml/XHTMLReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,25 @@
  * 02110-1301, USA.
  */
 
-#include <string.h>
+#include <iostream>
 
+#include <cstring>
+
+#include <ZLFile.h>
 #include <ZLFileImage.h>
 #include <ZLUnicodeUtil.h>
+#include <ZLStringUtil.h>
 
 #include "XHTMLReader.h"
 #include "../util/EntityFilesCollector.h"
 #include "../util/MiscUtil.h"
+#include "../css/StyleSheetParser.h"
 
 #include "../../bookmodel/BookReader.h"
 #include "../../bookmodel/BookModel.h"
 
+static const bool USE_CSS = false;
+
 std::map<std::string,XHTMLTagAction*> XHTMLReader::ourTagActions;
 
 XHTMLTagAction::~XHTMLTagAction() {
@@ -42,6 +49,21 @@
 	return reader.myPathPrefix;
 }
 
+void XHTMLTagAction::beginParagraph(XHTMLReader &reader) {
+	reader.beginParagraph();
+}
+
+void XHTMLTagAction::endParagraph(XHTMLReader &reader) {
+	reader.endParagraph();
+}
+
+class XHTMLTagLinkAction : public XHTMLTagAction {
+
+public:
+	void doAtStart(XHTMLReader &reader, const char **xmlattributes);
+	void doAtEnd(XHTMLReader &reader);
+};
+
 class XHTMLTagParagraphAction : public XHTMLTagAction {
 
 public:
@@ -49,6 +71,13 @@
 	void doAtEnd(XHTMLReader &reader);
 };
 
+class XHTMLTagBodyAction : public XHTMLTagAction {
+
+public:
+	void doAtStart(XHTMLReader &reader, const char **xmlattributes);
+	void doAtEnd(XHTMLReader &reader);
+};
+
 class XHTMLTagRestartParagraphAction : public XHTMLTagAction {
 
 public:
@@ -116,33 +145,78 @@
 	void doAtEnd(XHTMLReader &reader);
 };
 
+void XHTMLTagLinkAction::doAtStart(XHTMLReader &reader, const char **xmlattributes) {
+	static const std::string REL = "stylesheet";
+	const char *rel = reader.attributeValue(xmlattributes, "rel");
+	if ((rel == 0) || (REL != rel)) {
+		return;
+	}
+	static const std::string TYPE = "text/css";
+
+	const char *type = reader.attributeValue(xmlattributes, "type");
+	if ((type == 0) || (TYPE != type)) {
+		return;
+	}
+
+	const char *href = reader.attributeValue(xmlattributes, "href");
+	if (href == 0) {
+		return;
+	}
+
+	shared_ptr<ZLInputStream> cssStream = ZLFile(reader.myPathPrefix + href).inputStream();
+	if (cssStream.isNull()) {
+		return;
+	}
+	StyleSheetTableParser parser(reader.myStyleSheetTable);
+	parser.parse(*cssStream);
+	//reader.myStyleSheetTable.dump();
+}
+
+void XHTMLTagLinkAction::doAtEnd(XHTMLReader&) {
+}
+
 void XHTMLTagParagraphAction::doAtStart(XHTMLReader &reader, const char**) {
-	bookReader(reader).beginParagraph();
+	if (!reader.myNewParagraphInProgress) {
+		beginParagraph(reader);
+		reader.myNewParagraphInProgress = true;
+	}
 }
 
 void XHTMLTagParagraphAction::doAtEnd(XHTMLReader &reader) {
-	bookReader(reader).endParagraph();
+	endParagraph(reader);
+}
+
+void XHTMLTagBodyAction::doAtStart(XHTMLReader &reader, const char**) {
+	reader.myInsideBody = true;
+}
+
+void XHTMLTagBodyAction::doAtEnd(XHTMLReader &reader) {
+	endParagraph(reader);
+	reader.myInsideBody = false;
 }
 
 void XHTMLTagRestartParagraphAction::doAtStart(XHTMLReader &reader, const char**) {
-	bookReader(reader).endParagraph();
-	bookReader(reader).beginParagraph();
+	if (reader.myCurrentParagraphIsEmpty) {
+		bookReader(reader).addData(" ");
+	}
+	endParagraph(reader);
+	beginParagraph(reader);
 }
 
 void XHTMLTagRestartParagraphAction::doAtEnd(XHTMLReader&) {
 }
 
 void XHTMLTagItemAction::doAtStart(XHTMLReader &reader, const char**) {
-	bookReader(reader).endParagraph();
+	endParagraph(reader);
 	// TODO: increase left indent
-	bookReader(reader).beginParagraph();
+	beginParagraph(reader);
 	// TODO: replace bullet sign by number inside OL tag
 	const std::string bullet = "\xE2\x80\xA2\xC0\xA0";
 	bookReader(reader).addData(bullet);
 }
 
 void XHTMLTagItemAction::doAtEnd(XHTMLReader &reader) {
-	bookReader(reader).endParagraph();
+	endParagraph(reader);
 }
 
 XHTMLTagImageAction::XHTMLTagImageAction(const std::string &nameAttribute) : myNameAttribute(nameAttribute) {
@@ -150,20 +224,26 @@
 
 void XHTMLTagImageAction::doAtStart(XHTMLReader &reader, const char **xmlattributes) {
 	const char *fileName = reader.attributeValue(xmlattributes, myNameAttribute.c_str());
-	if (fileName != 0) {
-		bool flag = bookReader(reader).paragraphIsOpen();
-		if (flag) {
-			bookReader(reader).endParagraph();
-		}
-		if ((strlen(fileName) > 2) && strncmp(fileName, "./", 2) == 0) {
-			fileName +=2;
-		}
-		const std::string fullfileName = pathPrefix(reader) + fileName;
-		bookReader(reader).addImageReference(fullfileName);
-		bookReader(reader).addImage(fullfileName, new ZLFileImage("image/auto", fullfileName, 0));
-		if (flag) {
-			bookReader(reader).beginParagraph();
-		}
+	if (fileName == 0) {
+		return;
+	}
+
+	const std::string fullfileName = pathPrefix(reader) + fileName;
+	if (!ZLFile(fullfileName).exists()) {
+		return;
+	}
+
+	bool flag = bookReader(reader).paragraphIsOpen();
+	if (flag) {
+		endParagraph(reader);
+	}
+	if ((strlen(fileName) > 2) && strncmp(fileName, "./", 2) == 0) {
+		fileName +=2;
+	}
+	bookReader(reader).addImageReference(fullfileName);
+	bookReader(reader).addImage(fullfileName, new ZLFileImage("image/auto", fullfileName, 0));
+	if (flag) {
+		beginParagraph(reader);
 	}
 }
 
@@ -187,7 +267,7 @@
 	const char *href = reader.attributeValue(xmlattributes, "href");
 	if (href != 0) {
 		const std::string link = (*href == '#') ? (reader.myReferenceName + href) : href;
-		FBTextKind hyperlinkType = MiscUtil::isReference(link) ? EXTERNAL_HYPERLINK : INTERNAL_HYPERLINK;
+		const FBTextKind hyperlinkType = MiscUtil::referenceType(link);
 		myHyperlinkStack.push(hyperlinkType);
 		bookReader(reader).addHyperlinkControl(hyperlinkType, link);
 	} else {
@@ -215,23 +295,23 @@
 		bookReader(reader).insertEndOfSectionParagraph();
 	}
 	bookReader(reader).pushKind(myControl);
-	bookReader(reader).beginParagraph();
+	beginParagraph(reader);
 }
 
 void XHTMLTagParagraphWithControlAction::doAtEnd(XHTMLReader &reader) {
-	bookReader(reader).endParagraph();
+	endParagraph(reader);
 	bookReader(reader).popKind();
 }
 
 void XHTMLTagPreAction::doAtStart(XHTMLReader &reader, const char**) {
 	reader.myPreformatted = true;
-	bookReader(reader).beginParagraph();
+	beginParagraph(reader);
 	bookReader(reader).addControl(CODE, true);
 }
 
 void XHTMLTagPreAction::doAtEnd(XHTMLReader &reader) {
 	bookReader(reader).addControl(CODE, false);
-	bookReader(reader).endParagraph();
+	endParagraph(reader);
 	reader.myPreformatted = false;
 }
 
@@ -244,7 +324,7 @@
 void XHTMLReader::fillTagTable() {
 	if (ourTagActions.empty()) {
 		//addAction("html",	new XHTMLTagAction());
-		addAction("body",	new XHTMLTagParagraphAction());
+		addAction("body",	new XHTMLTagBodyAction());
 		//addAction("title",	new XHTMLTagAction());
 		//addAction("meta",	new XHTMLTagAction());
 		//addAction("script",	new XHTMLTagAction());
@@ -293,11 +373,11 @@
 		//addAction("blockquote",	new XHTMLTagAction());
 		addAction("br",	new XHTMLTagRestartParagraphAction());
 		//addAction("center",	new XHTMLTagAction());
-		addAction("div",	new XHTMLTagParagraphAction());
-		//addAction("dt",	new XHTMLTagAction());
+		addAction("div", new XHTMLTagParagraphAction());
+		addAction("dt", new XHTMLTagParagraphAction());
 		//addAction("head",	new XHTMLTagAction());
 		//addAction("hr",	new XHTMLTagAction());
-		//addAction("link",	new XHTMLTagAction());
+		addAction("link",	new XHTMLTagLinkAction());
 		//addAction("param",	new XHTMLTagAction());
 		//addAction("q",	new XHTMLTagAction());
 		//addAction("s",	new XHTMLTagAction());
@@ -319,30 +399,31 @@
 XHTMLReader::XHTMLReader(BookReader &modelReader) : myModelReader(modelReader) {
 }
 
-bool XHTMLReader::readFile(const std::string &pathPrefix, const std::string &fileName, const std::string &referenceName) {
+bool XHTMLReader::readFile(const std::string &filePath, const std::string &referenceName) {
 	myModelReader.addHyperlinkLabel(referenceName);
 
 	fillTagTable();
 
-	myPathPrefix = pathPrefix;
+	myPathPrefix = MiscUtil::htmlDirectoryPrefix(filePath);
 	myReferenceName = referenceName;
 
 	myPreformatted = false;
+	myNewParagraphInProgress = false;
+	myInsideBody = false;
 
-	return readDocument(pathPrefix + fileName);
-}
-
-bool XHTMLReader::readFile(const std::string &pathPrefix, shared_ptr<ZLInputStream> stream, const std::string &referenceName) {
-	myModelReader.addHyperlinkLabel(referenceName);
-
-	fillTagTable();
-
-	myPathPrefix = pathPrefix;
-	myReferenceName = referenceName;
+	myCSSStack.clear();
+	myStyleEntryStack.clear();
+	myStylesToRemove = 0;
 
-	myPreformatted = false;
+	return readDocument(filePath);
+}
 
-	return readDocument(stream);
+void XHTMLReader::addStyleEntry(const std::string tag, const std::string aClass) {
+	shared_ptr<ZLTextStyleEntry> entry = myStyleSheetTable.control(tag, aClass);
+	if (!entry.isNull()) {
+		myModelReader.addControl(*entry);
+		myStyleEntryStack.push_back(entry);
+	}
 }
 
 void XHTMLReader::startElementHandler(const char *tag, const char **attributes) {
@@ -352,37 +433,132 @@
 		myModelReader.addHyperlinkLabel(myReferenceName + HASH + id);
 	}
 
-	XHTMLTagAction *action = ourTagActions[ZLUnicodeUtil::toLower(tag)];
+	const std::string sTag = ZLUnicodeUtil::toLower(tag);
+
+	const char *aClass = attributeValue(attributes, "class");
+	const std::string sClass = (aClass != 0) ? aClass : "";
+
+	if (myStyleSheetTable.doBreakBefore(sTag, sClass)) {
+		myModelReader.insertEndOfSectionParagraph();
+	}
+	myDoPageBreakAfterStack.push_back(myStyleSheetTable.doBreakAfter(sTag, sClass));
+
+	XHTMLTagAction *action = ourTagActions[sTag];
 	if (action != 0) {
 		action->doAtStart(*this, attributes);
 	}
+
+	const int sizeBefore = myStyleEntryStack.size();
+	addStyleEntry(sTag, "");
+	addStyleEntry("", sClass);
+	addStyleEntry(sTag, sClass);
+	const char *style = attributeValue(attributes, "style");
+	if (style != 0) {
+		shared_ptr<ZLTextStyleEntry> entry = myStyleParser.parseString(style);
+		myModelReader.addControl(*entry);
+		myStyleEntryStack.push_back(entry);
+	}
+	myCSSStack.push_back(myStyleEntryStack.size() - sizeBefore);
 }
 
 void XHTMLReader::endElementHandler(const char *tag) {
+	for (int i = myCSSStack.back(); i > 0; --i) {
+		myModelReader.addControl(REGULAR, false);
+	}
+	myStylesToRemove = myCSSStack.back();
+	myCSSStack.pop_back();
+
 	XHTMLTagAction *action = ourTagActions[ZLUnicodeUtil::toLower(tag)];
 	if (action != 0) {
 		action->doAtEnd(*this);
+		myNewParagraphInProgress = false;
+	}
+
+	for (; myStylesToRemove > 0; --myStylesToRemove) {
+		myStyleEntryStack.pop_back();
+	}
+
+	if (myDoPageBreakAfterStack.back()) {
+		myModelReader.insertEndOfSectionParagraph();
+	}
+	myDoPageBreakAfterStack.pop_back();
+}
+
+void XHTMLReader::beginParagraph() {
+	myCurrentParagraphIsEmpty = true;
+	myModelReader.beginParagraph();
+	bool doBlockSpaceBefore = false;
+	for (std::vector<shared_ptr<ZLTextStyleEntry> >::const_iterator it = myStyleEntryStack.begin(); it != myStyleEntryStack.end(); ++it) {
+		myModelReader.addControl(**it);
+		doBlockSpaceBefore =
+			doBlockSpaceBefore ||
+			(*it)->lengthSupported(ZLTextStyleEntry::LENGTH_SPACE_BEFORE);
+	}
+
+	if (doBlockSpaceBefore) {
+		ZLTextStyleEntry blockingEntry;
+		blockingEntry.setLength(
+			ZLTextStyleEntry::LENGTH_SPACE_BEFORE,
+			0,
+			ZLTextStyleEntry::SIZE_UNIT_PIXEL
+		);
+		myModelReader.addControl(blockingEntry);
+	}
+}
+
+void XHTMLReader::endParagraph() {
+	bool doBlockSpaceAfter = false;
+	for (std::vector<shared_ptr<ZLTextStyleEntry> >::const_iterator it = myStyleEntryStack.begin(); it != myStyleEntryStack.end() - myStylesToRemove; ++it) {
+		doBlockSpaceAfter =
+			doBlockSpaceAfter ||
+			(*it)->lengthSupported(ZLTextStyleEntry::LENGTH_SPACE_AFTER);
+	}
+	if (doBlockSpaceAfter) {
+		ZLTextStyleEntry blockingEntry;
+		blockingEntry.setLength(
+			ZLTextStyleEntry::LENGTH_SPACE_AFTER,
+			0,
+			ZLTextStyleEntry::SIZE_UNIT_PIXEL
+		);
+		myModelReader.addControl(blockingEntry);
 	}
+	for (; myStylesToRemove > 0; --myStylesToRemove) {
+		myModelReader.addControl(*myStyleEntryStack.back());
+		myStyleEntryStack.pop_back();
+	}
+	myModelReader.endParagraph();
 }
 
-void XHTMLReader::characterDataHandler(const char *text, int len) {
+void XHTMLReader::characterDataHandler(const char *text, size_t len) {
 	if (myPreformatted) {
 		if ((*text == '\r') || (*text == '\n')) {
 			myModelReader.addControl(CODE, false);
-			myModelReader.endParagraph();
-			myModelReader.beginParagraph();
+			endParagraph();
+			beginParagraph();
 			myModelReader.addControl(CODE, true);
 		}
-		int spaceCounter = 0;
-		while ((spaceCounter < len) && isspace((unsigned char)*text)) {
+		size_t spaceCounter = 0;
+		while ((spaceCounter < len) && isspace((unsigned char)*(text + spaceCounter))) {
 			++spaceCounter;
 		}
 		myModelReader.addFixedHSpace(spaceCounter);
 		text += spaceCounter;
 		len -= spaceCounter;
+	} else if ((myNewParagraphInProgress) || !myModelReader.paragraphIsOpen()) {
+		while (isspace((unsigned char)*text)) {
+			++text;
+			if (--len == 0) {
+				break;
+			}
+		}
 	}
 	if (len > 0) {
+		myCurrentParagraphIsEmpty = false;
+		if (myInsideBody && !myModelReader.paragraphIsOpen()) {
+			myModelReader.beginParagraph();
+		}
 		myModelReader.addData(std::string(text, len));
+		myNewParagraphInProgress = false;
 	}
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/formats/xhtml/XHTMLReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/formats/xhtml/XHTMLReader.h
--- fbreader-0.8.17/fbreader/src/formats/xhtml/XHTMLReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/formats/xhtml/XHTMLReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,13 @@
 
 #include <string>
 #include <map>
-#include <stack>
+#include <vector>
 
 #include <ZLXMLReader.h>
 
+#include "../css/StyleSheetTable.h"
+#include "../css/StyleSheetParser.h"
+
 class BookReader;
 class XHTMLReader;
 
@@ -39,7 +42,9 @@
 
 protected:
 	static BookReader &bookReader(XHTMLReader &reader);	
-	const std::string &pathPrefix(XHTMLReader &reader);	
+	static const std::string &pathPrefix(XHTMLReader &reader);	
+	static void beginParagraph(XHTMLReader &reader);
+	static void endParagraph(XHTMLReader &reader);
 };
 
 class XHTMLReader : public ZLXMLReader {
@@ -53,24 +58,41 @@
 
 public:
 	XHTMLReader(BookReader &modelReader);
-	bool readFile(const std::string &pathPrefix, const std::string &fileName, const std::string &referenceName);
-	bool readFile(const std::string &pathPrefix, shared_ptr<ZLInputStream> stream, const std::string &referenceName);
+	bool readFile(const std::string &filePath, const std::string &referenceName);
 
+private:
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 	const std::vector<std::string> &externalDTDs() const;
 
+	void beginParagraph();
+	void endParagraph();
+	void addStyleEntry(const std::string tag, const std::string aClass);
+
 private:
 	BookReader &myModelReader;
 	std::string myPathPrefix;
 	std::string myReferenceName;
 	bool myPreformatted;
+	bool myNewParagraphInProgress;
+	StyleSheetTable myStyleSheetTable;
+	std::vector<int> myCSSStack;
+	std::vector<shared_ptr<ZLTextStyleEntry> > myStyleEntryStack;
+	int myStylesToRemove;
+	std::vector<bool> myDoPageBreakAfterStack;
+	bool myCurrentParagraphIsEmpty;
+	StyleSheetSingleStyleParser myStyleParser;
+	bool myInsideBody;
 
 	friend class XHTMLTagAction;
+	friend class XHTMLTagLinkAction;
 	friend class XHTMLTagHyperlinkAction;
 	friend class XHTMLTagPreAction;
+	friend class XHTMLTagParagraphAction;
+	friend class XHTMLTagBodyAction;
+	friend class XHTMLTagRestartParagraphAction;
 };
 
 #endif /* __XHTMLREADER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/FB2MigrationReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/FB2MigrationReader.cpp
--- fbreader-0.8.17/fbreader/src/migration/FB2MigrationReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/FB2MigrationReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 FB2MigrationReader::FB2MigrationReader(BookInfo &info, bool updateSeries) : myInfo(info), myUpdateSeries(updateSeries), myUpdateTags(info.TagsOption.value().empty()) {
 }
 
-void FB2MigrationReader::characterDataHandler(const char *text, int len) {
+void FB2MigrationReader::characterDataHandler(const char *text, size_t len) {
 	if (myReadState == READ_GENRE) {
 		myGenreBuffer.append(text, len);
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/FB2MigrationReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/FB2MigrationReader.h
--- fbreader-0.8.17/fbreader/src/migration/FB2MigrationReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/FB2MigrationReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 
 	void startElementHandler(int tag, const char **attributes);
 	void endElementHandler(int tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 private:
 	BookInfo &myInfo;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/HtmlDCTagsReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/HtmlDCTagsReader.cpp
--- fbreader-0.8.17/fbreader/src/migration/HtmlDCTagsReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/HtmlDCTagsReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 	myInfo.TagsOption.setValue(myTagList);
 }
 
-bool HtmlDCTagsReader::characterDataHandler(const char *text, int len, bool convert) {
+bool HtmlDCTagsReader::characterDataHandler(const char *text, size_t len, bool convert) {
 	if (myReadTag) {
 		if (convert) {
 			myConverter->convert(myBuffer, text, text + len);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/HtmlDCTagsReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/HtmlDCTagsReader.h
--- fbreader-0.8.17/fbreader/src/migration/HtmlDCTagsReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/HtmlDCTagsReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 	void endDocumentHandler();
 
 	bool tagHandler(const HtmlTag &tag);
-	bool characterDataHandler(const char *text, int len, bool convert);
+	bool characterDataHandler(const char *text, size_t len, bool convert);
 
 private:
 	BookInfo &myInfo;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/migrate.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/migrate.cpp
--- fbreader-0.8.17/fbreader/src/migration/migrate.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/migrate.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,13 +27,16 @@
 }
 
 bool MigrationRunnable::shouldMigrate() const {
-	return myVersionOption.value() < VERSION;
+	return
+		Migration::extractVersionInformation(myVersionOption.value()) <
+		Migration::extractVersionInformation(VERSION);
 }
 
 void MigrationRunnable::run() {
 	Migration_0_8_11().doMigration();
 	Migration_0_8_13().doMigration();
 	Migration_0_8_16().doMigration();
+	Migration_0_10_4().doMigration();
 
 	myVersionOption.setValue(VERSION);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/migrate.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/migrate.h
--- fbreader-0.8.17/fbreader/src/migration/migrate.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/migrate.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/Migration_0_10_4.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_10_4.cpp
--- fbreader-0.8.17/fbreader/src/migration/Migration_0_10_4.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_10_4.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <vector>
+
+#include <ZLStringUtil.h>
+#include <ZLUnicodeUtil.h>
+
+#include "Migration.h"
+#include "../options/FBOptions.h"
+
+Migration_0_10_4::Migration_0_10_4() : Migration("0.10.4") {
+}
+
+void Migration_0_10_4::doMigrationInternal() {
+	std::vector<std::string> groups;
+	ZLOption::listOptionGroups(groups);
+	for (std::vector<std::string>::const_iterator it = groups.begin(); it != groups.end(); ++it) {
+		static const std::string zipPostfix = ".zip";
+		static const std::string sizeName = "Size";
+		if (ZLStringUtil::stringEndsWith(ZLUnicodeUtil::toLower(*it), zipPostfix)) {
+			ZLIntegerOption option(FBCategoryKey::BOOKS, *it, sizeName, -1);
+			option.setValue(-1);
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/Migration_0_8_11.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_8_11.cpp
--- fbreader-0.8.17/fbreader/src/migration/Migration_0_8_11.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_8_11.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/Migration_0_8_13.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_8_13.cpp
--- fbreader-0.8.17/fbreader/src/migration/Migration_0_8_13.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_8_13.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/Migration_0_8_16.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_8_16.cpp
--- fbreader-0.8.17/fbreader/src/migration/Migration_0_8_16.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/Migration_0_8_16.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
  * 02110-1301, USA.
  */
 
-#include <ZLUnicodeUtil.h>
 #include <ZLFile.h>
 
 #include "Migration.h"
@@ -57,7 +56,7 @@
 					languageOption.setValue("zh");
 				}
 
-				const std::string extension = ZLUnicodeUtil::toLower(file.extension());
+				const std::string extension = file.extension();
 				if (extension == "fb2") {
 					ZLBooleanOption seriesOption(FBCategoryKey::BOOKS, *it, "SequenceDefined", false);
 					if (!seriesOption.value() || info.TagsOption.value().empty()) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/Migration.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/Migration.cpp
--- fbreader-0.8.17/fbreader/src/migration/Migration.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/Migration.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <cstdlib>
+
 #include <ZLStringUtil.h>
 
 #include "../options/FBOptions.h"
@@ -42,7 +44,7 @@
 	return
 		ZLStringUtil::stringStartsWith(str, "/") ||
 		ZLStringUtil::stringStartsWith(str, "\\\\") ||
-		(str.length() > 2) && (str.substr(1, 2) == ":\\");
+		((str.length() > 2) && (str.substr(1, 2) == ":\\"));
 }
 
 Migration::Migration(const std::string &version) : myVersion(version) {
@@ -51,9 +53,25 @@
 Migration::~Migration() {
 }
 
+int Migration::extractVersionInformation(const std::string &name) {
+	int major = atoi(name.c_str());
+	int minor = 0;
+	int point = 0;
+	int index = name.find('.');
+	if (index > 0) {
+		minor = atoi(name.c_str() + index + 1);
+		index = name.find('.', index + 1);
+		if (index > 0) {
+			point = atoi(name.c_str() + index + 1);
+		}
+	}
+	return 10000 * major + 100 * minor + point;
+}
+
 void Migration::doMigration() {
 	ZLStringOption versionOption(FBCategoryKey::SYSTEM, "Version", "FBReaderVersion", "0");
-	if (versionOption.value() < myVersion) {
+	if (extractVersionInformation(versionOption.value()) <
+			extractVersionInformation(myVersion)) {
 		doMigrationInternal();
 	}
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/Migration.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/Migration.h
--- fbreader-0.8.17/fbreader/src/migration/Migration.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/Migration.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,9 @@
 
 class Migration {
 
+public:
+	static int extractVersionInformation(const std::string &name);
+
 protected:
 	static void moveOption(
 		const ZLCategoryKey &oldCategory, const std::string &oldGroup, const std::string &oldName,
@@ -73,4 +76,13 @@
 	void doMigrationInternal();
 };
 
+class Migration_0_10_4 : public Migration {
+
+public:
+	Migration_0_10_4();
+
+protected:
+	void doMigrationInternal();
+};
+
 #endif /* __MIGRATION_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/OEBMigrationReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/OEBMigrationReader.cpp
--- fbreader-0.8.17/fbreader/src/migration/OEBMigrationReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/OEBMigrationReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include <ZLUnicodeUtil.h>
 
 #include "OEBMigrationReader.h"
+#include "../constants/XMLNamespace.h"
 
 OEBMigrationReader::OEBMigrationReader(BookInfo &info) : myInfo(info) {
 }
@@ -29,19 +30,19 @@
 static const std::string DC_METADATA = "dc-metadata";
 static const std::string SUBJECT_TAG = ":subject";
 
-void OEBMigrationReader::characterDataHandler(const char *text, int len) {
+void OEBMigrationReader::characterDataHandler(const char *text, size_t len) {
 	if (myReadSubject) {
 		myBuffer.append(text, len);
 	}
 }
 
 bool OEBMigrationReader::isDublinCoreNamespace(const std::string &nsId) const {
-	static const std::string DC_SCHEME_PREFIX = "http://purl.org/dc/elements";
 	const std::map<std::string,std::string> &namespaceMap = namespaces();
 	std::map<std::string,std::string>::const_iterator iter = namespaceMap.find(nsId);
 	return
-		(iter != namespaceMap.end()) &&
-		ZLStringUtil::stringStartsWith(iter->second, DC_SCHEME_PREFIX);
+		((iter != namespaceMap.end()) &&
+		 (ZLStringUtil::stringStartsWith(iter->second, XMLNamespace::DublinCorePrefix) ||
+		  ZLStringUtil::stringStartsWith(iter->second, XMLNamespace::DublinCoreLegacyPrefix)));
 }
 
 void OEBMigrationReader::startElementHandler(const char *tag, const char**) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/migration/OEBMigrationReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/migration/OEBMigrationReader.h
--- fbreader-0.8.17/fbreader/src/migration/OEBMigrationReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/migration/OEBMigrationReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 	bool processNamespaces() const;
 
 private:
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.cpp
--- fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLStringUtil.h>
+
+#include "FBReaderOrgDataParser.h"
+#include "../../constants/XMLNamespace.h"
+
+FBReaderOrgDataParser::FBReaderOrgDataParser(NetworkBookList &books) : myBooks(books) {
+}
+
+bool FBReaderOrgDataParser::processNamespaces() const {
+	return true;
+}
+
+void FBReaderOrgDataParser::namespaceListChangedHandler() {
+	myDCPrefix.erase();
+	const std::map<std::string,std::string> &nsMap = namespaces();
+	for (std::map<std::string,std::string>::const_iterator it = nsMap.begin(); it != nsMap.end(); ++it) {
+		if (ZLStringUtil::stringStartsWith(it->second, XMLNamespace::DublinCorePrefix)) {
+			myDCPrefix = it->first + ':';
+			break;
+		}
+	}
+}
+
+static const std::string BOOK_TAG = "book";
+static const std::string URL_TAG = "url";
+
+static const std::string SUBJECT_DC_TAG = "subject";
+static const std::string TITLE_DC_TAG = "title";
+static const std::string AUTHOR_DC_TAG = "author";
+static const std::string DATE_DC_TAG = "date";
+static const std::string DESCRIPTION_DC_TAG = "description";
+
+static const std::string COVER_URL_TYPE = "cover";
+static const std::string BUY_URL_TYPE = "buy";
+static const std::string EPUB_URL_TYPE = "epub";
+static const std::string MOBIPOCKET_URL_TYPE = "mobipocket";
+
+void FBReaderOrgDataParser::startElementHandler(const char *tag, const char **attributes) {
+	if (BOOK_TAG == tag) {
+		const char *id = attributeValue(attributes, "id");
+		if (id != 0) {
+			myCurrentBook = new NetworkBookInfo(id);
+		}
+	} else if ((myCurrentBook != 0) && (URL_TAG == tag)) {
+		const char *type = attributeValue(attributes, "type");
+		if (type != 0) {
+			myURLType = type;
+		} else {
+			myURLType.erase();
+		}
+	}
+	myBuffer.clear();
+}
+
+void FBReaderOrgDataParser::endElementHandler(const char *tag) {
+	if (!myCurrentBook.isNull()) {
+		const std::string sTag = tag;
+		if (!myDCPrefix.empty() &&
+				ZLStringUtil::stringStartsWith(sTag, myDCPrefix)) {
+			const std::string dcTag = sTag.substr(myDCPrefix.length());
+			if (SUBJECT_DC_TAG == dcTag) {
+				myCurrentBook->Tags.push_back(myBuffer);
+			} else if (TITLE_DC_TAG == dcTag) {
+				myCurrentBook->Title = myBuffer;
+			} else if (DESCRIPTION_DC_TAG == dcTag) {
+				myCurrentBook->Annotation = myBuffer;
+			} else if (AUTHOR_DC_TAG == dcTag) {
+				myCurrentBook->Author.DisplayName = myBuffer;
+				int index = myBuffer.rfind(' ');
+				if (index >= 0) {
+					myCurrentBook->Author.SortKey = myBuffer.substr(index + 1);
+				} else {
+					myCurrentBook->Author.SortKey = myBuffer;
+				}
+			} else if (DATE_DC_TAG == dcTag) {
+				myCurrentBook->Date = myBuffer;
+			}
+		} else {
+			if (BOOK_TAG == sTag) {
+				myBooks.push_back(myCurrentBook);
+				myCurrentBook.reset();
+			} else if (URL_TAG == sTag) {
+				if (COVER_URL_TYPE == myURLType) {
+					myCurrentBook->Cover = myBuffer;
+				} else if (BUY_URL_TYPE == myURLType) {
+					myCurrentBook->URLByType[NetworkBookInfo::LINK_HTTP] = myBuffer;
+				} else if (EPUB_URL_TYPE == myURLType) {
+					myCurrentBook->URLByType[NetworkBookInfo::BOOK_EPUB] = myBuffer;
+				} else if (MOBIPOCKET_URL_TYPE == myURLType) {
+					myCurrentBook->URLByType[NetworkBookInfo::BOOK_MOBIPOCKET] = myBuffer;
+				}
+			}
+		}
+	}
+
+	myBuffer.clear();
+}
+
+void FBReaderOrgDataParser::characterDataHandler(const char *data, size_t len) {
+	myBuffer.append(data, len);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.h
--- fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgDataParser.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __FBREADERORGDATAPARSER_H__
+#define __FBREADERORGDATAPARSER_H__
+
+#include <ZLXMLReader.h>
+
+#include "../NetworkBookInfo.h"
+
+class FBReaderOrgDataParser : public ZLXMLReader {
+
+public:
+	FBReaderOrgDataParser(NetworkBookList &books);
+
+private:
+	void startElementHandler(const char *tag, const char **attributes);
+	void endElementHandler(const char *tag);
+	void characterDataHandler(const char *text, size_t len);
+	bool processNamespaces() const;
+	void namespaceListChangedHandler();
+
+private:
+	NetworkBookList &myBooks;
+	std::string myBuffer;
+	shared_ptr<NetworkBookInfo> myCurrentBook;
+	std::string myDCPrefix;
+	std::string myURLType;
+};
+
+#endif /* __FBREADERORGDATAPARSER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.cpp
--- fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLNetworkUtil.h>
+#include <ZLNetworkXMLParserData.h>
+
+#include "FBReaderOrgLink.h"
+#include "FBReaderOrgDataParser.h"
+#include "../NetworkBookInfo.h"
+
+FBReaderOrgLink::FBReaderOrgLink() : NetworkLink("LitRes.Ru", "litres.ru") {
+}
+
+static const std::string URL_PREFIX = "http://www.fbreader.org/library/";
+
+shared_ptr<ZLNetworkData> FBReaderOrgLink::simpleSearchData(NetworkBookList &books, const std::string &pattern) {
+	return new ZLNetworkXMLParserData(
+		URL_PREFIX + "simple_query.php?type=xml&library=1&pattern=" + ZLNetworkUtil::htmlEncode(pattern),
+		new FBReaderOrgDataParser(books)
+	);
+}
+
+void FBReaderOrgLink::addSubPattern(std::string &url, const std::string &name, const std::string &value) {
+	if (!value.empty()) {
+		url += "&" + name + "=" + ZLNetworkUtil::htmlEncode(value);
+	}
+}
+
+shared_ptr<ZLNetworkData> FBReaderOrgLink::advancedSearchData(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation) {
+	std::string request = URL_PREFIX + "advanced_query.php?type=xml&library=1";
+	addSubPattern(request, "title", title);
+	addSubPattern(request, "author", author);
+	addSubPattern(request, "series", series);
+	addSubPattern(request, "tag", tag);
+	addSubPattern(request, "annotation", annotation);
+
+	return new ZLNetworkXMLParserData(request, new FBReaderOrgDataParser(books));
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.h
--- fbreader-0.8.17/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/fbreaderOrg/FBReaderOrgLink.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __FBREADERORGLINK_H__
+#define __FBREADERORGLINK_H__
+
+#include "../NetworkLink.h"
+
+class FBReaderOrgLink : public NetworkLink {
+
+public:
+	FBReaderOrgLink();
+
+	shared_ptr<ZLNetworkData> simpleSearchData(NetworkBookList &books, const std::string &pattern);
+	shared_ptr<ZLNetworkData> advancedSearchData(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation);
+
+private:
+	void addSubPattern(std::string &url, const std::string &name, const std::string &value);
+};
+
+#endif /* __FBREADERORGLINK_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksDataParser.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksDataParser.cpp
--- fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksDataParser.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksDataParser.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLStringUtil.h>
+
+#include "FeedBooksDataParser.h"
+#include "../../constants/XMLNamespace.h"
+
+FeedBooksDataParser::FeedBooksDataParser(NetworkBookList &books) : myBooks(books) {
+}
+
+bool FeedBooksDataParser::processNamespaces() const {
+	return true;
+}
+
+void FeedBooksDataParser::namespaceListChangedHandler() {
+	myDCPrefix.erase();
+	const std::map<std::string,std::string> &nsMap = namespaces();
+	for (std::map<std::string,std::string>::const_iterator it = nsMap.begin(); it != nsMap.end(); ++it) {
+		if (ZLStringUtil::stringStartsWith(it->second, XMLNamespace::DublinCorePrefix)) {
+			myDCPrefix = it->first + ':';
+			break;
+		}
+	}
+}
+
+static const std::string BOOK_TAG = "book";
+static const std::string COVER_TAG = "cover";
+static const std::string FILES_TAG = "files";
+static const std::string EPUB_TAG = "epub";
+static const std::string MOBIPOCKET_TAG = "mobipocket";
+//static const std::string PDF_TAG = "pdf";
+
+static const std::string SUBJECT_DC_TAG = "subject";
+static const std::string TITLE_DC_TAG = "title";
+static const std::string AUTHOR_DC_TAG = "author";
+static const std::string LANGUAGE_DC_TAG = "language";
+static const std::string DATE_DC_TAG = "date";
+static const std::string DESCRIPTION_DC_TAG = "description";
+
+void FeedBooksDataParser::startElementHandler(const char *tag, const char **attributes) {
+	if (BOOK_TAG == tag) {
+		const char *id = attributeValue(attributes, "id");
+		if (id != 0) {
+			myCurrentBook = new NetworkBookInfo(id);
+		}
+	}
+	myBuffer.clear();
+}
+
+void FeedBooksDataParser::endElementHandler(const char *tag) {
+	if (!myCurrentBook.isNull()) {
+		const std::string sTag = tag;
+		if (!myDCPrefix.empty() &&
+				ZLStringUtil::stringStartsWith(sTag, myDCPrefix)) {
+			const std::string dcTag = sTag.substr(myDCPrefix.length());
+			if (SUBJECT_DC_TAG == dcTag) {
+				myCurrentBook->Tags.push_back(myBuffer);
+			} else if (TITLE_DC_TAG == dcTag) {
+				myCurrentBook->Title = myBuffer;
+			} else if (DESCRIPTION_DC_TAG == dcTag) {
+				myCurrentBook->Annotation = myBuffer;
+			} else if (AUTHOR_DC_TAG == dcTag) {
+				int index = myBuffer.find(',');
+				if (index >= 0) {
+					std::string before = myBuffer.substr(0, index);
+					std::string after = myBuffer.substr(index + 1);
+					ZLStringUtil::stripWhiteSpaces(before);
+					ZLStringUtil::stripWhiteSpaces(after);
+					myCurrentBook->Author.SortKey = before;
+					myCurrentBook->Author.DisplayName = after + ' ' + before;
+				} else {
+					ZLStringUtil::stripWhiteSpaces(myBuffer);
+					index = myBuffer.rfind(' ');
+					myCurrentBook->Author.SortKey = myBuffer.substr(index + 1);
+					myCurrentBook->Author.DisplayName = myBuffer;
+				}
+			} else if (LANGUAGE_DC_TAG == dcTag) {
+				myCurrentBook->Language = myBuffer;
+			} else if (DATE_DC_TAG == dcTag) {
+				myCurrentBook->Date = myBuffer;
+			}
+		} else {
+			if (BOOK_TAG == sTag) {
+				myBooks.push_back(myCurrentBook);
+				myCurrentBook.reset();
+			} else if (COVER_TAG == sTag) {
+				myCurrentBook->Cover = myBuffer;
+			} else if (EPUB_TAG == sTag) {
+				myCurrentBook->URLByType[NetworkBookInfo::BOOK_EPUB] = myBuffer;
+			} else if (MOBIPOCKET_TAG == sTag) {
+				myCurrentBook->URLByType[NetworkBookInfo::BOOK_MOBIPOCKET] = myBuffer;
+			//} else if (PDF_TAG == sTag) {
+				//myCurrentBook->URLByType[NetworkBookInfo::BOOK_PDF] = myBuffer;
+			}
+		}
+	}
+
+	myBuffer.clear();
+}
+
+void FeedBooksDataParser::characterDataHandler(const char *data, size_t len) {
+	myBuffer.append(data, len);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksDataParser.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksDataParser.h
--- fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksDataParser.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksDataParser.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __FEEDBOOKSDATAPARSER_H__
+#define __FEEDBOOKSDATAPARSER_H__
+
+#include <ZLXMLReader.h>
+
+#include "../NetworkBookInfo.h"
+
+class FeedBooksDataParser : public ZLXMLReader {
+
+public:
+	FeedBooksDataParser(NetworkBookList &books);
+
+private:
+	void startElementHandler(const char *tag, const char **attributes);
+	void endElementHandler(const char *tag);
+	void characterDataHandler(const char *text, size_t len);
+	bool processNamespaces() const;
+	void namespaceListChangedHandler();
+
+private:
+	NetworkBookList &myBooks;
+	std::string myBuffer;
+	shared_ptr<NetworkBookInfo> myCurrentBook;
+	std::string myDCPrefix;
+};
+
+#endif /* __FEEDBOOKSDATAPARSER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksLink.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksLink.cpp
--- fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksLink.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksLink.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <cctype>
+
+#include <ZLNetworkUtil.h>
+#include <ZLNetworkXMLParserData.h>
+
+#include "FeedBooksLink.h"
+#include "FeedBooksDataParser.h"
+#include "../fbreaderOrg/FBReaderOrgDataParser.h"
+#include "../NetworkBookInfo.h"
+
+static const std::string URL_PREFIX = "http://www.fbreader.org/library/";
+
+static void addSubPattern(std::string &url, const std::string &name, const std::string &value) {
+	if (!value.empty()) {
+		url += "&" + name + "=" + ZLNetworkUtil::htmlEncode(value);
+	}
+}
+
+FeedBooksLink::FeedBooksLink() : NetworkLink("FeedBooks.Com", "feedbooks.com") {
+}
+
+shared_ptr<ZLNetworkData> FeedBooksLink::simpleSearchData(NetworkBookList &books, const std::string &pattern) {
+	return new ZLNetworkXMLParserData(
+		"http://feedbooks.com/books/search.xml?query=" + ZLNetworkUtil::htmlEncode(pattern),
+		new FeedBooksDataParser(books)
+	);
+}
+
+shared_ptr<ZLNetworkData> FeedBooksLink::advancedSearchData(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation) {
+	std::string request = URL_PREFIX + "advanced_query.php?type=xml&library=2";
+	addSubPattern(request, "title", title);
+	addSubPattern(request, "author", author);
+	addSubPattern(request, "series", series);
+	addSubPattern(request, "tag", tag);
+	addSubPattern(request, "annotation", annotation);
+
+	return new ZLNetworkXMLParserData(request, new FBReaderOrgDataParser(books));
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksLink.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksLink.h
--- fbreader-0.8.17/fbreader/src/network/feedbooks/FeedBooksLink.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/feedbooks/FeedBooksLink.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __FEEDBOOKSLINK_H__
+#define __FEEDBOOKSLINK_H__
+
+#include "../NetworkLink.h"
+
+class FeedBooksLink : public NetworkLink {
+
+public:
+	FeedBooksLink();
+
+	shared_ptr<ZLNetworkData> simpleSearchData(NetworkBookList &books, const std::string &pattern);
+	shared_ptr<ZLNetworkData> advancedSearchData(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation);
+};
+
+#endif /* __FEEDBOOKSLINK_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/NetworkBookInfo.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/NetworkBookInfo.cpp
--- fbreader-0.8.17/fbreader/src/network/NetworkBookInfo.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/NetworkBookInfo.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "NetworkBookInfo.h"
+
+NetworkBookInfo::NetworkBookInfo(const std::string &id) : Id(id) {
+}
+
+std::string NetworkBookInfo::fileName(URLType format) const {
+	std::string fName = Author.DisplayName + "_" + Title + "_(" + Language + ").";
+	switch (format) {
+		case LINK_HTTP:
+			break;
+		case BOOK_EPUB:
+			fName += "epub";
+			break;
+		case BOOK_MOBIPOCKET:
+			fName += "mobi";
+			break;
+		case BOOK_PDF:
+			fName += "pdf";
+			break;
+	}
+
+	const std::string charsToEscape = ":;<|>+/\\";
+
+	const size_t len = fName.length();
+	for (size_t i = 0; i < len; ++i) {
+		if (charsToEscape.find(fName[i]) != (size_t)-1) {
+			fName[i] = '_';
+		}
+	}
+	return fName;
+}
+
+bool NetworkBookInfo::AuthorData::operator < (const AuthorData &data) const {
+	const int sComp = SortKey.compare(data.SortKey);
+	return (sComp < 0) ||
+				 ((sComp == 0) && (DisplayName < data.DisplayName));
+}
+
+bool NetworkBookInfo::Comparator::operator () (const shared_ptr<NetworkBookInfo> &first, const shared_ptr<NetworkBookInfo> &second) {
+	const bool firstBookHasSeries = !first->Series.empty();
+	const bool secondBookHasSeries = !second->Series.empty();
+	if (firstBookHasSeries && secondBookHasSeries) {
+		const int comp = first->Series.compare(second->Series);
+		if (comp != 0) {
+			return comp < 0;
+		}
+		return first->Title < second->Title;
+	}
+
+	const std::string &firstKey =
+		firstBookHasSeries ? first->Series : first->Title;
+	const std::string &secondKey =
+		secondBookHasSeries ? second->Series : second->Title;
+	const int comp = firstKey.compare(secondKey);
+	if (comp != 0) {
+		return comp < 0;
+	}
+	return secondBookHasSeries;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/NetworkBookInfo.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/NetworkBookInfo.h
--- fbreader-0.8.17/fbreader/src/network/NetworkBookInfo.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/NetworkBookInfo.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __NETWORKBOOKINFO_H__
+#define __NETWORKBOOKINFO_H__
+
+#include <string>
+#include <map>
+#include <vector>
+
+#include <shared_ptr.h>
+
+struct NetworkBookInfo {
+	enum URLType {
+		BOOK_EPUB,
+		BOOK_MOBIPOCKET,
+		BOOK_PDF,
+		LINK_HTTP,
+	};
+
+	const std::string Id;
+
+	std::string Title;
+	struct AuthorData {
+		std::string DisplayName;
+		std::string SortKey;
+
+		bool operator < (const AuthorData &data) const;
+	};
+	AuthorData Author;
+	std::string Identifier;
+	std::string Language;
+	std::vector<std::string> Tags;
+	std::string Cover;
+	std::string Date;
+	std::string Series;
+	std::string Annotation;
+	std::map<URLType,std::string> URLByType;
+
+	NetworkBookInfo(const std::string &id);
+	std::string fileName(URLType format) const;
+
+	struct Comparator {
+		bool operator () (const shared_ptr<NetworkBookInfo> &first, const shared_ptr<NetworkBookInfo> &second);
+	};
+};
+
+typedef std::vector<shared_ptr<NetworkBookInfo> > NetworkBookList;
+
+#endif /* __NETWORKBOOKINFO_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/NetworkLinkCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/NetworkLinkCollection.cpp
--- fbreader-0.8.17/fbreader/src/network/NetworkLinkCollection.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/NetworkLinkCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLFile.h>
+#include <ZLDir.h>
+#include <ZLStringUtil.h>
+#include <ZLResource.h>
+#include <ZLNetworkManager.h>
+
+#include "NetworkLink.h"
+
+#include "feedbooks/FeedBooksLink.h"
+#include "fbreaderOrg/FBReaderOrgLink.h"
+
+#include "../options/FBOptions.h"
+
+NetworkLinkCollection *NetworkLinkCollection::ourInstance = 0;
+
+NetworkLinkCollection &NetworkLinkCollection::instance() {
+	if (ourInstance == 0) {
+		ourInstance = new NetworkLinkCollection();
+	}
+	return *ourInstance;
+}
+
+NetworkLinkCollection::NetworkLinkCollection() :
+	DirectoryOption(ZLCategoryKey::NETWORK, "Options", "DownloadDirectory", "") {
+	myLinks.push_back(new FeedBooksLink());
+	myLinks.push_back(new FBReaderOrgLink());
+}
+
+NetworkLinkCollection::~NetworkLinkCollection() {
+}
+
+static std::string normalize(const std::string &url) {
+	static const std::string PREFIX0 = "http://feedbooks.com/";
+	static const std::string PREFIX1 = "http://www.feedbooks.com/";
+	static const std::string STANZA_PREFIX = "http://feedbooks.com/book/stanza/";
+
+	std::string nURL = url;
+	if (ZLStringUtil::stringStartsWith(nURL, PREFIX1)) {
+		nURL = PREFIX0 + nURL.substr(PREFIX1.length());
+	}
+	if (ZLStringUtil::stringStartsWith(nURL, STANZA_PREFIX)) {
+		nURL = PREFIX0 + "book/" + nURL.substr(STANZA_PREFIX.length()) + ".epub";
+	}
+	return nURL;
+}
+
+std::string NetworkLinkCollection::bookFileName(const std::string &url) const {
+	return ZLStringOption(ZLCategoryKey::NETWORK, "Files", ::normalize(url), "").value();
+}
+
+std::string NetworkLinkCollection::downloadBook(const std::string &url, std::string &fileName) const {
+	const std::string nURL = ::normalize(url);
+	ZLStringOption fileNameOption(ZLCategoryKey::NETWORK, "Files", nURL, "");
+	std::string storedFileName = fileNameOption.value();
+	if (!storedFileName.empty() && ZLFile(storedFileName).exists()) {
+		fileName = storedFileName;
+		return "";
+	}
+
+	const ZLResource &errorResource = ZLResource::resource("dialog")["networkError"];
+	shared_ptr<ZLDir> dir = ZLFile(DirectoryOption.value()).directory(true);
+	if (dir.isNull()) {
+		return ZLStringUtil::printf(errorResource["couldntCreateDirectoryMessage"].value(), DirectoryOption.value());
+	}
+
+	if (fileName.empty()) {
+		size_t index = nURL.rfind('/');
+		if (index >= nURL.length() - 1) {
+			return errorResource["unknownErrorMessage"].value();
+		}
+		fileName = nURL.substr(index + 1);
+	}
+	fileName = dir->itemPath(fileName);
+	if (ZLFile(fileName).exists()) {
+		ZLFile(fileName).remove();
+	}
+	fileNameOption.setValue(fileName);
+	return ZLNetworkManager::instance().downloadFile(nURL, fileName);
+}
+
+std::string NetworkLinkCollection::simpleSearch(NetworkBookList &books, const std::string &pattern) {
+	std::vector<shared_ptr<ZLNetworkData> > dataList;
+
+	std::vector<NetworkBookList> bookLists(myLinks.size());
+	int count = 0;
+
+	for (LinkVector::const_iterator it = myLinks.begin(); it != myLinks.end(); ++it) {
+		NetworkLink &link = **it;
+		if (link.OnOption.value()) {
+			dataList.push_back(link.simpleSearchData(bookLists[count++], pattern));
+		}
+	}
+
+	std::string result = ZLNetworkManager::instance().perform(dataList);
+
+	for (std::vector<NetworkBookList>::const_iterator jt = bookLists.begin(); jt != bookLists.end(); ++jt) {
+		books.insert(books.end(), jt->begin(), jt->end());
+	}
+
+	return result;
+}
+
+std::string NetworkLinkCollection::advancedSearch(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation) {
+	std::vector<shared_ptr<ZLNetworkData> > dataList;
+
+	std::vector<NetworkBookList> bookLists(myLinks.size());
+	int count = 0;
+
+	for (LinkVector::const_iterator it = myLinks.begin(); it != myLinks.end(); ++it) {
+		NetworkLink &link = **it;
+		if (link.OnOption.value()) {
+			dataList.push_back(link.advancedSearchData(bookLists[count++], title, author, series, tag, annotation));
+		}
+	}
+
+	std::string result = ZLNetworkManager::instance().perform(dataList);
+
+	for (std::vector<NetworkBookList>::const_iterator jt = bookLists.begin(); jt != bookLists.end(); ++jt) {
+		books.insert(books.end(), jt->begin(), jt->end());
+	}
+
+	return result;
+}
+
+size_t NetworkLinkCollection::size() const {
+	return myLinks.size();
+}
+
+NetworkLink &NetworkLinkCollection::link(size_t index) const {
+	return *myLinks[index];
+}
+
+bool NetworkLinkCollection::containsEnabledLinks() const {
+	for (LinkVector::const_iterator it = myLinks.begin(); it != myLinks.end(); ++it) {
+		if ((*it)->OnOption.value()) {
+			return true;
+		}
+	}
+	return false;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/NetworkLink.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/NetworkLink.cpp
--- fbreader-0.8.17/fbreader/src/network/NetworkLink.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/NetworkLink.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLUnicodeUtil.h>
+#include <ZLNetworkData.h>
+#include <ZLNetworkUtil.h>
+
+#include "NetworkLink.h"
+
+#include "../options/FBOptions.h"
+
+NetworkLink::NetworkLink(const std::string &siteName, const std::string &optionName) : SiteName(siteName), OnOption(ZLCategoryKey::NETWORK, optionName, "on", true) {
+}
+
+NetworkLink::~NetworkLink() {
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/network/NetworkLink.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/network/NetworkLink.h
--- fbreader-0.8.17/fbreader/src/network/NetworkLink.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/fbreader/src/network/NetworkLink.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __NETWORKLINK_H__
+#define __NETWORKLINK_H__
+
+#include <string>
+#include <vector>
+
+#include <shared_ptr.h>
+#include <ZLOptions.h>
+
+#include "NetworkBookInfo.h"
+
+class ZLNetworkData;
+
+class NetworkLink {
+
+protected:
+	NetworkLink(const std::string &siteName, const std::string &optionName);
+
+public:
+	virtual ~NetworkLink();
+
+public:
+	const std::string SiteName;
+	ZLBooleanOption OnOption;
+
+public:
+	virtual shared_ptr<ZLNetworkData> simpleSearchData(NetworkBookList &books, const std::string &pattern) = 0;
+	virtual shared_ptr<ZLNetworkData> advancedSearchData(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation) = 0;
+};
+
+class NetworkLinkCollection {
+
+public:
+	static NetworkLinkCollection &instance();
+
+private:
+	static NetworkLinkCollection *ourInstance;
+
+public:
+	ZLStringOption DirectoryOption;
+
+private:
+	NetworkLinkCollection();
+	~NetworkLinkCollection();
+
+public:
+	std::string bookFileName(const std::string &url) const;
+	// returns error message
+	std::string downloadBook(const std::string &url, std::string &fileName) const;
+
+	// returns error message
+	std::string simpleSearch(NetworkBookList &books, const std::string &pattern);
+	// returns error message
+	std::string advancedSearch(NetworkBookList &books, const std::string &title, const std::string &author, const std::string &series, const std::string &tag, const std::string &annotation);
+
+	size_t size() const;
+	NetworkLink &link(size_t index) const;
+	bool containsEnabledLinks() const;
+
+private:
+	typedef std::vector<shared_ptr<NetworkLink> > LinkVector;
+	LinkVector myLinks;
+};
+
+#endif /* __NETWORKLINK_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/options/FBOptions.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/options/FBOptions.cpp
--- fbreader-0.8.17/fbreader/src/options/FBOptions.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/options/FBOptions.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/options/FBOptions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/options/FBOptions.h
--- fbreader-0.8.17/fbreader/src/options/FBOptions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/options/FBOptions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/ConfigPage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ConfigPage.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/ConfigPage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ConfigPage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/ConfigPage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ConfigPage.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/ConfigPage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ConfigPage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/FormatOptionsPage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/FormatOptionsPage.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/FormatOptionsPage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/FormatOptionsPage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,8 +37,8 @@
 static const ZLResourceKey KEY_ALIGNMENT("alignment");
 static const ZLResourceKey KEY_SPACEBEFORE("spaceBefore");
 static const ZLResourceKey KEY_SPACEAFTER("spaceAfter");
-static const ZLResourceKey KEY_LEFTINDENT("leftIndent");
-static const ZLResourceKey KEY_RIGHTINDENT("rightIndent");
+static const ZLResourceKey KEY_STARTINDENT("startIndent");
+static const ZLResourceKey KEY_ENDINDENT("endIndent");
 
 FormatOptionsPage::FormatOptionsPage(ZLDialogContent &dialogTab) {
 	const ZLResource &styleResource = ZLResource::resource(KEY_STYLE);
@@ -82,13 +82,13 @@
 			
 			registerEntries(dialogTab,
 				KEY_SPACEBEFORE, new ZLSimpleSpinOptionEntry(decoration->SpaceBeforeOption, 1),
-				KEY_LEFTINDENT, new ZLSimpleSpinOptionEntry(decoration->LeftIndentOption, 1),
+				KEY_STARTINDENT, new ZLSimpleSpinOptionEntry(decoration->LineStartIndentOption, 1),
 				name
 			);
 			
 			registerEntries(dialogTab,
 				KEY_SPACEAFTER, new ZLSimpleSpinOptionEntry(decoration->SpaceAfterOption, 1),
-				KEY_RIGHTINDENT, new ZLSimpleSpinOptionEntry(decoration->RightIndentOption, 1),
+				KEY_ENDINDENT, new ZLSimpleSpinOptionEntry(decoration->LineEndIndentOption, 1),
 				name
 			);
 			
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/FormatOptionsPage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/FormatOptionsPage.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/FormatOptionsPage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/FormatOptionsPage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/IndicatorTab.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/IndicatorTab.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/IndicatorTab.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/IndicatorTab.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,49 +71,101 @@
 	);
 }
 
+class IndicatorTypeEntry : public ZLComboOptionEntry {
+
+public:
+	IndicatorTypeEntry(const ZLResource &resource, ZLIntegerRangeOption &typeOption);
+	void addDependentEntry(ZLOptionEntry *entry);
+	const std::string &initialValue() const;
+
+private:
+	const std::vector<std::string> &values() const;
+	void onAccept(const std::string &value);
+	void onValueSelected(int index);
+
+private:
+	ZLIntegerRangeOption &myOption; 
+	std::vector<std::string> myValues;
+	std::vector<ZLOptionEntry*> myDependentEntries;
+};
+
+IndicatorTypeEntry::IndicatorTypeEntry(const ZLResource &resource, ZLIntegerRangeOption &typeOption) : myOption(typeOption) {
+	myValues.push_back(resource["osScrollbar"].value());
+	myValues.push_back(resource["fbIndicator"].value());
+	myValues.push_back(resource["none"].value());
+}
+
+const std::string &IndicatorTypeEntry::initialValue() const {
+	return myValues[myOption.value()];
+}
+
+const std::vector<std::string> &IndicatorTypeEntry::values() const {
+	return myValues;
+}
+
+void IndicatorTypeEntry::addDependentEntry(ZLOptionEntry *entry) {
+	myDependentEntries.push_back(entry);
+}
+
+void IndicatorTypeEntry::onAccept(const std::string &value) {
+	for (size_t index = 0; index != myValues.size(); ++index) {
+		if (myValues[index] == value) {
+			myOption.setValue(index);
+			break;
+		}
+	}
+}
+
+void IndicatorTypeEntry::onValueSelected(int index) {
+	for (std::vector<ZLOptionEntry*>::iterator it = myDependentEntries.begin(); it != myDependentEntries.end(); ++it) {
+		(*it)->setVisible(index == FBIndicatorStyle::FB_INDICATOR);
+	}
+}
+
 void OptionsDialog::createIndicatorTab(FBReader &fbreader) {
 	ZLDialogContent &indicatorTab = myDialog->createTab(ZLResourceKey("Indicator"));
 	FBIndicatorStyle &indicatorInfo = FBView::commonIndicatorInfo();
-	ZLToggleBooleanOptionEntry *showIndicatorEntry =
-		new ZLToggleBooleanOptionEntry(indicatorInfo.ShowOption);
-	indicatorTab.addOption(ZLResourceKey("show"), showIndicatorEntry);
+	static ZLResourceKey typeKey("type");
+	IndicatorTypeEntry *indicatorTypeEntry =
+		new IndicatorTypeEntry(indicatorTab.resource(typeKey), indicatorInfo.TypeOption);
+	indicatorTab.addOption(typeKey, indicatorTypeEntry);
 
 	ZLOptionEntry *heightEntry =
 		new ZLSimpleSpinOptionEntry(indicatorInfo.HeightOption, 1);
 	ZLOptionEntry *offsetEntry =
 		new ZLSimpleSpinOptionEntry(indicatorInfo.OffsetOption, 1);
 	indicatorTab.addOptions(ZLResourceKey("height"), heightEntry, ZLResourceKey("offset"), offsetEntry);
-	showIndicatorEntry->addDependentEntry(heightEntry);
-	showIndicatorEntry->addDependentEntry(offsetEntry);
+	indicatorTypeEntry->addDependentEntry(heightEntry);
+	indicatorTypeEntry->addDependentEntry(offsetEntry);
 
 	StateOptionEntry *showTextPositionEntry =
 		new StateOptionEntry(indicatorInfo.ShowTextPositionOption);
 	indicatorTab.addOption(ZLResourceKey("pageNumber"), showTextPositionEntry);
-	showIndicatorEntry->addDependentEntry(showTextPositionEntry);
+	indicatorTypeEntry->addDependentEntry(showTextPositionEntry);
 
 	StateOptionEntry *showTimeEntry =
 		new StateOptionEntry(indicatorInfo.ShowTimeOption);
 	indicatorTab.addOption(ZLResourceKey("time"), showTimeEntry);
-	showIndicatorEntry->addDependentEntry(showTimeEntry);
+	indicatorTypeEntry->addDependentEntry(showTimeEntry);
 
 	SpecialFontSizeEntry *fontSizeEntry =
 		new SpecialFontSizeEntry(indicatorInfo.FontSizeOption, 2, *showTextPositionEntry, *showTimeEntry);
 	indicatorTab.addOption(ZLResourceKey("fontSize"), fontSizeEntry);
-	showIndicatorEntry->addDependentEntry(fontSizeEntry);
+	indicatorTypeEntry->addDependentEntry(fontSizeEntry);
 	showTextPositionEntry->addDependentEntry(fontSizeEntry);
 	showTimeEntry->addDependentEntry(fontSizeEntry);
 
 	ZLOptionEntry *tocMarksEntry =
 		new ZLSimpleBooleanOptionEntry(fbreader.bookTextView().ShowTOCMarksOption);
 	indicatorTab.addOption(ZLResourceKey("tocMarks"), tocMarksEntry);
-	showIndicatorEntry->addDependentEntry(tocMarksEntry);
+	indicatorTypeEntry->addDependentEntry(tocMarksEntry);
 
 	ZLOptionEntry *navigationEntry =
 		new ZLSimpleBooleanOptionEntry(indicatorInfo.IsSensitiveOption);
 	indicatorTab.addOption(ZLResourceKey("navigation"), navigationEntry);
-	showIndicatorEntry->addDependentEntry(navigationEntry);
+	indicatorTypeEntry->addDependentEntry(navigationEntry);
 
-	showIndicatorEntry->onStateChanged(showIndicatorEntry->initialState());
+	indicatorTypeEntry->onStringValueSelected(indicatorTypeEntry->initialValue());
 	showTextPositionEntry->onStateChanged(showTextPositionEntry->initialState());
 	showTimeEntry->onStateChanged(showTimeEntry->initialState());
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/IntegrationTab.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/IntegrationTab.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/IntegrationTab.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/IntegrationTab.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/KeyBindingsPage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/KeyBindingsPage.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/KeyBindingsPage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/KeyBindingsPage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@
 	void onValueChanged(const std::string &key, int index);
 	void onKeySelected(const std::string &key);
 
-	void setOrientation(ZLViewWidget::Angle);
+	void setOrientation(ZLView::Angle);
 	void setExitOnCancelEntry(ZLOptionEntry *exitOnCancelEntry);
 
 private:
@@ -98,17 +98,17 @@
 MultiKeyOptionEntry::MultiKeyOptionEntry(const ZLResource &resource, FBReader &fbreader) :
 	ZLKeyOptionEntry(),
 	myResource(resource),
-	myEntry0(myBimap, fbreader.keyBindings(ZLViewWidget::DEGREES0)),
-	myEntry90(myBimap, fbreader.keyBindings(ZLViewWidget::DEGREES90)),
-	myEntry180(myBimap, fbreader.keyBindings(ZLViewWidget::DEGREES180)),
-	myEntry270(myBimap, fbreader.keyBindings(ZLViewWidget::DEGREES270)),
+	myEntry0(myBimap, *fbreader.keyBindings(ZLView::DEGREES0)),
+	myEntry90(myBimap, *fbreader.keyBindings(ZLView::DEGREES90)),
+	myEntry180(myBimap, *fbreader.keyBindings(ZLView::DEGREES180)),
+	myEntry270(myBimap, *fbreader.keyBindings(ZLView::DEGREES270)),
 	myCurrentEntry(&myEntry0),
 	myExitOnCancelEntry(0) {
 	addAction(ZLApplication::NoAction);
 
 	// switch view
 	addAction(ActionCode::SHOW_COLLECTION);
-	addAction(ActionCode::SHOW_LAST_BOOKS);
+	addAction(ActionCode::SHOW_NET_LIBRARY);
 	addAction(ActionCode::OPEN_PREVIOUS_BOOK);
 	addAction(ActionCode::SHOW_CONTENTS);
 
@@ -140,7 +140,6 @@
 	addAction(ActionCode::DECREASE_FONT);
 	addAction(ActionCode::SHOW_HIDE_POSITION_INDICATOR);
 	addAction(ActionCode::TOGGLE_FULLSCREEN);
-	addAction(ActionCode::FULLSCREEN_ON);
 	addAction(ActionCode::ROTATE_SCREEN);
 
 	// dialogs
@@ -153,18 +152,18 @@
 	addAction(ActionCode::QUIT);
 }
 
-void MultiKeyOptionEntry::setOrientation(ZLViewWidget::Angle angle) {
+void MultiKeyOptionEntry::setOrientation(ZLView::Angle angle) {
 	switch (angle) {
-		case ZLViewWidget::DEGREES0:
+		case ZLView::DEGREES0:
 			myCurrentEntry = &myEntry0;
 			break;
-		case ZLViewWidget::DEGREES90:
+		case ZLView::DEGREES90:
 			myCurrentEntry = &myEntry90;
 			break;
-		case ZLViewWidget::DEGREES180:
+		case ZLView::DEGREES180:
 			myCurrentEntry = &myEntry180;
 			break;
-		case ZLViewWidget::DEGREES270:
+		case ZLView::DEGREES270:
 			myCurrentEntry = &myEntry270;
 			break;
 	}
@@ -231,11 +230,11 @@
 }
 
 void OrientationEntry::onValueSelected(int index) {
-	static ZLViewWidget::Angle angles[] = {
-		ZLViewWidget::DEGREES0,
-		ZLViewWidget::DEGREES90,
-		ZLViewWidget::DEGREES180,
-		ZLViewWidget::DEGREES270
+	static ZLView::Angle angles[] = {
+		ZLView::DEGREES0,
+		ZLView::DEGREES90,
+		ZLView::DEGREES180,
+		ZLView::DEGREES270
 	};
 	myKeyEntry.setOrientation(angles[index]);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/KeyBindingsPage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/KeyBindingsPage.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/KeyBindingsPage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/KeyBindingsPage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/OptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsDialog.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/OptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include <ZLPaintContext.h>
 #include <ZLLanguageList.h>
 #include <ZLEncodingConverter.h>
+#include <ZLNetworkManager.h>
 
 #include <optionEntries/ZLToggleBooleanOptionEntry.h>
 #include <optionEntries/ZLColorOptionBuilder.h>
@@ -42,8 +43,8 @@
 #include "../fbreader/FBReader.h"
 #include "../fbreader/BookTextView.h"
 #include "../fbreader/CollectionView.h"
-#include "../fbreader/RecentBooksView.h"
 
+#include "../network/NetworkLink.h"
 #include "../collection/BookCollection.h"
 #include "../external/ProgramCollection.h"
 #include "../formats/FormatPlugin.h"
@@ -96,11 +97,11 @@
 	switch (myAngleOption.value()) {
 		default:
 			return 0;
-		case ZLViewWidget::DEGREES90:
+		case ZLView::DEGREES90:
 			return 1;
-		case ZLViewWidget::DEGREES180:
+		case ZLView::DEGREES180:
 			return 2;
-		case ZLViewWidget::DEGREES270:
+		case ZLView::DEGREES270:
 			return 3;
 		case -1:
 			return 4;
@@ -108,16 +109,16 @@
 }
 
 void RotationTypeEntry::onAccept(int index) {
-	int angle = ZLViewWidget::DEGREES0;
+	int angle = ZLView::DEGREES0;
 	switch (index) {
 		case 1:
-			angle = ZLViewWidget::DEGREES90;
+			angle = ZLView::DEGREES90;
 			break;
 		case 2:
-			angle = ZLViewWidget::DEGREES180;
+			angle = ZLView::DEGREES180;
 			break;
 		case 3:
-			angle = ZLViewWidget::DEGREES270;
+			angle = ZLView::DEGREES270;
 			break;
 		case 4:
 			angle = -1;
@@ -152,18 +153,34 @@
 
 	myDialog = ZLDialogManager::instance().createOptionsDialog(ZLResourceKey("OptionsDialog"), new OptionsApplyRunnable(fbreader), true);
 
-	ZLDialogContent &generalTab = myDialog->createTab(ZLResourceKey("Library"));
+	ZLDialogContent &libraryTab = myDialog->createTab(ZLResourceKey("Library"));
 	CollectionView &collectionView = fbreader.collectionView();
-	generalTab.addOption(ZLResourceKey("bookPath"), collectionView.collection().PathOption);
-	generalTab.addOption(ZLResourceKey("lookInSubdirectories"), collectionView.collection().ScanSubdirsOption);
-	RecentBooksView &recentBooksView = (RecentBooksView&)*fbreader.myRecentBooksView;
-	generalTab.addOption(ZLResourceKey("recentListSize"), new ZLSimpleSpinOptionEntry(recentBooksView.lastBooks().MaxListSizeOption, 1));
-	ZLToggleBooleanOptionEntry *showTagsEntry = new ZLToggleBooleanOptionEntry(collectionView.ShowTagsOption);
-	ZLOptionEntry *showAllBooksTagEntry = new ZLSimpleBooleanOptionEntry(collectionView.ShowAllBooksTagOption);
-	showTagsEntry->addDependentEntry(showAllBooksTagEntry);
-	generalTab.addOption(ZLResourceKey("showTags"), showTagsEntry);
-	generalTab.addOption(ZLResourceKey("showAllBooksList"), showAllBooksTagEntry);
-	showTagsEntry->onStateChanged(showTagsEntry->initialState());
+	libraryTab.addOption(ZLResourceKey("bookPath"), collectionView.collection().PathOption);
+	libraryTab.addOption(ZLResourceKey("lookInSubdirectories"), collectionView.collection().ScanSubdirsOption);
+	libraryTab.addOption(ZLResourceKey("collectBooksWithoutMetaInfo"), collectionView.collection().CollectAllBooksOption);
+	libraryTab.addOption(ZLResourceKey("downloadDirectory"), NetworkLinkCollection::instance().DirectoryOption);
+	libraryTab.addOption(ZLResourceKey("showAllBooksTag"), collectionView.ShowAllBooksTagOption);
+
+	ZLDialogContent &networkTab = myDialog->createTab(ZLResourceKey("NetworkLibrary"));
+	NetworkLinkCollection &linkCollection = NetworkLinkCollection::instance();
+	const size_t linkCollectionSize = linkCollection.size();
+	for (size_t i = 0; i < linkCollectionSize; ++i) {
+		NetworkLink &link = linkCollection.link(i);
+		networkTab.addOption(link.SiteName, "", new ZLSimpleBooleanOptionEntry(link.OnOption));
+	}
+	ZLNetworkManager &networkManager = ZLNetworkManager::instance();
+	if (!networkManager.providesProxyInfo()) {
+		ZLToggleBooleanOptionEntry *useProxyEntry = new ZLToggleBooleanOptionEntry(networkManager.UseProxyOption());
+		networkTab.addOption(ZLResourceKey("useProxy"), useProxyEntry);
+		ZLSimpleStringOptionEntry *proxyHostEntry = new ZLSimpleStringOptionEntry(networkManager.ProxyHostOption());
+		networkTab.addOption(ZLResourceKey("proxyHost"), proxyHostEntry);
+		ZLSimpleStringOptionEntry *proxyPortEntry = new ZLSimpleStringOptionEntry(networkManager.ProxyPortOption());
+		networkTab.addOption(ZLResourceKey("proxyPort"), proxyPortEntry);
+		useProxyEntry->addDependentEntry(proxyHostEntry);
+		useProxyEntry->addDependentEntry(proxyPortEntry);
+		useProxyEntry->onStateChanged(useProxyEntry->initialState());
+	}
+	networkTab.addOption(ZLResourceKey("timeout"), new ZLSimpleSpinOptionEntry(networkManager.TimeoutOption(), 5));
 
 	ZLDialogContent &encodingTab = myDialog->createTab(ZLResourceKey("Language"));
 	encodingTab.addOption(ZLResourceKey("autoDetect"), new ZLSimpleBooleanOptionEntry(PluginCollection::instance().LanguageAutoDetectOption));
@@ -179,6 +196,9 @@
 	ZLDialogContent &selectionTab = myDialog->createTab(ZLResourceKey("Selection"));
 	selectionTab.addOption(ZLResourceKey("enableSelection"), FBView::selectionOption());
 
+	ZLDialogContent &cssTab = myDialog->createTab(ZLResourceKey("CSS"));
+	cssTab.addOption(ZLResourceKey("overrideSpecifiedFonts"), ZLTextStyleCollection::instance().OverrideSpecifiedFontsOption);
+
 	ZLDialogContent &marginTab = myDialog->createTab(ZLResourceKey("Margins"));
 	FBMargins &margins = FBView::margins();
 	marginTab.addOptions(
@@ -207,8 +227,9 @@
 	builder.addOption(BACKGROUND, baseStyle.BackgroundColorOption);
 	builder.addOption(resource["selectionBackground"].value(), baseStyle.SelectionBackgroundColorOption);
 	builder.addOption(resource["text"].value(), baseStyle.RegularTextColorOption);
-	builder.addOption(resource["internalLink"].value(), baseStyle.InternalHyperlinkTextColorOption);
-	builder.addOption(resource["externalLink"].value(), baseStyle.ExternalHyperlinkTextColorOption);
+	builder.addOption(resource["internalLink"].value(), baseStyle.hyperlinkColorOption("internal"));
+	builder.addOption(resource["externalLink"].value(), baseStyle.hyperlinkColorOption("external"));
+	builder.addOption(resource["bookLink"].value(), baseStyle.hyperlinkColorOption("book"));
 	builder.addOption(resource["highlighted"].value(), baseStyle.SelectedTextColorOption);
 	builder.addOption(resource["treeLines"].value(), baseStyle.TreeLinesColorOption);
 	builder.addOption(resource["indicator"].value(), (FBView::commonIndicatorInfo().ColorOption));
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/OptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsDialog.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/OptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/OptionsPage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsPage.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/OptionsPage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsPage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/OptionsPage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsPage.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/OptionsPage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/OptionsPage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/ScrollingOptionsPage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ScrollingOptionsPage.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/ScrollingOptionsPage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ScrollingOptionsPage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/ScrollingOptionsPage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ScrollingOptionsPage.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/ScrollingOptionsPage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/ScrollingOptionsPage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/StyleOptionsPage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/StyleOptionsPage.cpp
--- fbreader-0.8.17/fbreader/src/optionsDialog/StyleOptionsPage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/StyleOptionsPage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 	myComboEntry->addValue(myComboEntry->initialValue());
 
 	ZLTextStyleCollection &collection = ZLTextStyleCollection::instance();
-	ZLTextKind styles[] = { REGULAR, TITLE, SECTION_TITLE, SUBTITLE, H1, H2, H3, H4, H5, H6, CONTENTS_TABLE_ENTRY, RECENT_BOOK_LIST, LIBRARY_AUTHOR_ENTRY, LIBRARY_BOOK_ENTRY, ANNOTATION, EPIGRAPH, AUTHOR, DATEKIND, POEM_TITLE, STANZA, VERSE, CITE, INTERNAL_HYPERLINK, EXTERNAL_HYPERLINK, FOOTNOTE, ITALIC, EMPHASIS, BOLD, STRONG, DEFINITION, DEFINITION_DESCRIPTION, PREFORMATTED, CODE };
+	ZLTextKind styles[] = { REGULAR, TITLE, SECTION_TITLE, SUBTITLE, H1, H2, H3, H4, H5, H6, CONTENTS_TABLE_ENTRY, LIBRARY_ENTRY, ANNOTATION, EPIGRAPH, AUTHOR, DATEKIND, POEM_TITLE, STANZA, VERSE, CITE, INTERNAL_HYPERLINK, EXTERNAL_HYPERLINK, BOOK_HYPERLINK, FOOTNOTE, ITALIC, EMPHASIS, BOLD, STRONG, DEFINITION, DEFINITION_DESCRIPTION, PREFORMATTED, CODE };
 	const int STYLES_NUMBER = sizeof(styles) / sizeof(ZLTextKind);
 	for (int i = 0; i < STYLES_NUMBER; ++i) {
 		const ZLTextStyleDecoration *decoration = collection.decoration(styles[i]);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/src/optionsDialog/StyleOptionsPage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/src/optionsDialog/StyleOptionsPage.h
--- fbreader-0.8.17/fbreader/src/optionsDialog/StyleOptionsPage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/src/optionsDialog/StyleOptionsPage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/fbreader/VERSION /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/fbreader/VERSION
--- fbreader-0.8.17/fbreader/VERSION	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/fbreader/VERSION	2009-04-30 22:26:45.000000000 +0100
@@ -1 +1 @@
-0.8.17
+0.10.7
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/desktop.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/desktop.mk
--- fbreader-0.8.17/makefiles/arch/desktop.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/desktop.mk	2009-04-30 22:26:45.000000000 +0100
@@ -35,8 +35,5 @@
   UILIBS = $(shell pkg-config --libs gtk+-2.0) -lpng -ljpeg
 endif
 
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
-
 RM = rm -rvf
 RM_QUIET = rm -rf
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/ebr.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/ebr.mk
--- fbreader-0.8.17/makefiles/arch/ebr.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/ebr.mk	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,8 @@
 include $(ROOTDIR)/makefiles/arch/unix.mk
 
+INSTALLDIR = /mnt/ext2
+ZLSHARED = no
+
 SDK_DIR = /usr/local/arm/3.4.1
 SDK_BIN_DIR = $(SDK_DIR)/arm-linux/bin
 
@@ -7,11 +10,10 @@
 AR = $(SDK_BIN_DIR)/ar rsu
 LD = $(SDK_BIN_DIR)/g++
 
-CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG -I $(ROOTDIR)/../ebr/ext/include
-LDFLAGS = -L $(ROOTDIR)/../ebr/ext/lib
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG -I $(ROOTDIR)/../ebr/microwin/src/include -I $(ROOTDIR)/../ebr/ext/include -DXMLCONFIGHOMEDIR=\"/mnt/ext2\" -DDO_ICONV_CAST
+LDFLAGS = -L $(ROOTDIR)/../ebr/microwin/lib/jpeg -L $(ROOTDIR)/../ebr/microwin/lib/mfont -L $(ROOTDIR)/../ebr/microwin/src/lib -L $(ROOTDIR)/../ebr/ext/lib
 
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
+UILIBS = -lnano-X -ljpeg -lmfont
 
 RM = rm -rvf
 RM_QUIET = rm -rf
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/macosx.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/macosx.mk
--- fbreader-0.8.17/makefiles/arch/macosx.mk	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/makefiles/arch/macosx.mk	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,21 @@
+include $(ROOTDIR)/makefiles/arch/unix.mk
+
+ifeq "$(INSTALLDIR)" ""
+  INSTALLDIR=/usr
+endif
+IMAGEDIR = $(INSTALLDIR)/share/pixmaps
+APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME%
+
+ZLSHARED = no
+
+CC = gcc
+AR = ar rsu
+LD = g++
+
+CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+LDFLAGS =
+EXTERNAL_INCLUDE = -I/sw/include -I/opt/local/include
+EXTERNAL_LIBS = -L/sw/lib -L/opt/local/lib
+
+RM = rm -rvf
+RM_QUIET = rm -rf
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/maemo.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/maemo.mk
--- fbreader-0.8.17/makefiles/arch/maemo.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/maemo.mk	2009-04-30 22:26:45.000000000 +0100
@@ -12,15 +12,22 @@
 RM_QUIET = rm -rf
 
 LD = g++
-ifeq "$(UI_TYPE)" "maemo4"
+ifeq "$(UI_TYPE)" "maemo5"
+	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -DMAEMO_VERSION=4
+	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
+	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic
+else ifeq "$(UI_TYPE)" "maemo4"
 	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -mthumb -DMAEMO_VERSION=4
-	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
-	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0
-else # ifeq "$(UI_TYPE)" "maemo2"
-	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -mthumb -DMAEMO_VERSION=2
-	GTKINCLUDE = -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/hildon-widgets -I/usr/include/hildon-lgpl -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
+	GTKINCLUDE = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12 -DMAEMO_CHANGES -I/usr/include/hildon-1 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
+	UILIBS = -lhildon-1 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgmodule-2.0 -ldl -lfreetype -lz -lfontconfig -lpng12 -lXrender -lX11 -losso -ldbus-glib-1 -ldbus-1 -lgobject-2.0 -lglib-2.0 -lconic
+else # ifeq "$(UI_TYPE)" "maemo2/3"
+	CFLAGS = -pipe -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -pthread -mthumb
+	GTKINCLUDE = -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/hildon-widgets -I/usr/include/hildon-lgpl -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/conic
 	UILIBS = -lz -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lm -lgmodule-2.0 -ldl -lgthread-2.0 -lhildonwidgets -losso
+  ifeq "$(UI_TYPE)" "maemo2"
+		CFLAGS += -DMAEMO_VERSION=2
+  else # ifeq "$(UI_TYPE)" "maemo3"
+		CFLAGS += -DMAEMO_VERSION=3
+		UILIBS += -lconic
+  endif
 endif
-
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/moto.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/moto.mk
--- fbreader-0.8.17/makefiles/arch/moto.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/moto.mk	2009-04-30 22:26:45.000000000 +0100
@@ -19,8 +19,5 @@
 QTINCLUDE = -I $(QT_PATH)/include -I $(QT_PATH)/include/ezx
 UILIBS = -L$(QT_PATH)/lib -L$(QT_PATH)/lib/ezx -lqte-mt -lezxappbase -lezxappsdk -lezxopenwindow -lipp-miscGen -lipp-jp -lezxjpeg -lezxpm
 
-CFLAGS = -pipe -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -mcpu=iwmmxt -mtune=iwmmxt -Wno-ctor-dtor-privacy -W -ftemplate-depth-30
+CFLAGS = -pipe -Duint16_t="unsigned short" -Duint32_t="unsigned int" -DQWS -fno-exceptions -fno-rtti -Wall -W -O2 -mcpu=iwmmxt -mtune=iwmmxt -Wno-ctor-dtor-privacy -W -ftemplate-depth-30
 LDFLAGS = 
-
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/opensimpad-0.9.0.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/opensimpad-0.9.0.mk
--- fbreader-0.8.17/makefiles/arch/opensimpad-0.9.0.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/opensimpad-0.9.0.mk	2009-04-30 22:26:45.000000000 +0100
@@ -19,8 +19,8 @@
 AR = $(TOOLSPATH)/ar rsu
 LD = $(TOOLSPATH)/g++
 
-XML_LIB = -L $(OEPATH)/lib -lexpat
-ARCHIVER_LIB = -L $(OEPATH)/lib -lz -lbz2
+XML_LIBS = -L $(OEPATH)/lib -lexpat
+ARCHIVER_LIBS = -L $(OEPATH)/lib -lz -lbz2
 
 CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale -mfloat-abi=soft --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
 LDFLAGS = -Wl,-rpath,$(LIBDIR)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/openzaurus.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/openzaurus.mk
--- fbreader-0.8.17/makefiles/arch/openzaurus.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/openzaurus.mk	2009-04-30 22:26:45.000000000 +0100
@@ -23,14 +23,11 @@
 AR = $(TOOLSPATH)/arm-linux-ar rsu
 LD = $(TOOLSPATH)/arm-linux-g++
 
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
-
 ifeq "$(UI_TYPE)" "opie"
 	UILIBS = -lqte -lqpe
 else
 	UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
 endif
 
-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param inline-unit-growth=200 --param large-function-growth=400 -Wall -Wno-ctor-dtor-privacy -W -Winline
+CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param inline-unit-growth=200 --param large-function-growth=2000 -Wall -Wno-ctor-dtor-privacy -W -Winline
 LDFLAGS = -Wl,-rpath,$(LIBDIR)
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/pdaxrom.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/pdaxrom.mk
--- fbreader-0.8.17/makefiles/arch/pdaxrom.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/pdaxrom.mk	2009-04-30 22:26:45.000000000 +0100
@@ -19,9 +19,6 @@
 INCPATH = $(USRPATH)/include
 GTKINCLUDE = -I$(INCPATH)/libxml2 -I$(INCPATH)/libglade-2.0 -I$(INCPATH)/gtk-2.0 -I$(USRPATH)/lib/gtk-2.0/include -I$(USRPATH)/X11R6/include -I$(INCPATH)/atk-1.0 -I$(INCPATH)/pango-1.0 -I$(INCPATH)/freetype2 -I$(INCPATH)/glib-2.0 -I$(USRPATH)/lib/glib-2.0/include
 
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
-
 ifeq "$(UI_TYPE)" "qt"
 	UILIBS = -L $(USRPATH)/qt/lib -lqt-mt -L $(USRPATH)/X11R6/lib -lXext -lXrender -lXrandr -lXcursor -lX11 -lXft -lSM -lICE
 else
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/pepperpad3.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/pepperpad3.mk
--- fbreader-0.8.17/makefiles/arch/pepperpad3.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/pepperpad3.mk	2009-04-30 22:26:45.000000000 +0100
@@ -35,8 +35,5 @@
   UILIBS = $(shell pkg-config --libs gtk+-2.0) -lpng -ljpeg
 endif
 
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
-
 RM = rm -rvf
 RM_QUIET = rm -rf
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/pma400.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/pma400.mk
--- fbreader-0.8.17/makefiles/arch/pma400.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/pma400.mk	2009-04-30 22:26:45.000000000 +0100
@@ -17,6 +17,3 @@
 
 CFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -ftemplate-depth-30 -DXMLCONFIGHOMEDIR=\"~/Documents\"
 DEPGEN = $(CC) -MM
-
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/pocketpc.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/pocketpc.mk
--- fbreader-0.8.17/makefiles/arch/pocketpc.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/pocketpc.mk	2009-04-30 22:26:45.000000000 +0100
@@ -18,8 +18,6 @@
 
 #UILIBS = -lgdi32 -lcomctl32 -lcomdlg32 -lpng12 -ljpeg -lungif -ltiff
 UILIBS = -lcoredll -lpng -ljpeg -lungif -ltiff
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
 
 RM = rm -rvf
 RM_QUIET = rm -rf
@@ -27,8 +25,8 @@
 BUILD_RESOURCE_OBJECT = yes
 
 .resources:
-	@echo -n "Creating resource object..."
-	@echo "ApplicationIcon ICON icons/win32/$(TARGET).ico" > $(TARGET).rc
+	@echo -n 'Creating resource object...'
+	@echo 'ApplicationIcon ICON icons/win32/$(TARGET).ico' > $(TARGET).rc
 	@$(RESOURCE_COMPILER) $(TARGET).rc -o src/$(TARGET)_rc.o
 	@$(RM_QUIET) $(TARGET).rc
-	@echo " OK"
+	@echo ' OK'
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/qvfb.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/qvfb.mk
--- fbreader-0.8.17/makefiles/arch/qvfb.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/qvfb.mk	2009-04-30 22:26:45.000000000 +0100
@@ -15,8 +15,5 @@
 AR = ar rsu
 LD = g++
 
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
-
 CFLAGS = -pipe -DOPIE_NO_DEBUG -DOPIE_NO_BUILTIN_SHUTDOWN -DUSE_FILE_NOTIFICATION -DOPIE_SOUND_FRAGMENT_SHIFT=16 -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
 DEPGEN = $(CC) -MM
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/win32.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/win32.mk
--- fbreader-0.8.17/makefiles/arch/win32.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/win32.mk	2009-04-30 22:26:45.000000000 +0100
@@ -11,10 +11,9 @@
 
 CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DUNICODE -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500
 LDFLAGS = -mwindows
+#LDFLAGS = -mconsole
 
 UILIBS = -lgdi32 -lcomctl32 -lcomdlg32 -lpng12 -ljpeg -lungif -ltiff
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
 
 RM = rm -rvf
 RM_QUIET = rm -rf
@@ -22,9 +21,9 @@
 BUILD_RESOURCE_OBJECT = yes
 
 .resources:
-	@echo -n "Creating resource object..."
-	@echo "ApplicationIcon ICON data/icons/application/win32.ico" > $(TARGET).rc
-	@echo "1 24 win32/manifest" >> $(TARGET).rc
+	@echo -n 'Creating resource object...'
+	@echo 'ApplicationIcon ICON data/icons/application/win32.ico' > $(TARGET).rc
+	@echo '1 24 win32/manifest' >> $(TARGET).rc
 	@$(RESOURCE_COMPILER) $(TARGET).rc -o src/$(TARGET)_rc.o
 	@$(RM_QUIET) $(TARGET).rc
-	@echo " OK"
+	@echo ' OK'
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/arch/zaurus.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/arch/zaurus.mk
--- fbreader-0.8.17/makefiles/arch/zaurus.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/arch/zaurus.mk	2009-04-30 22:26:45.000000000 +0100
@@ -19,8 +19,5 @@
 AR = $(TOOLSPATH)/ar rsu
 LD = $(TOOLSPATH)/g++
 
-CFLAGS = -pipe -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DUSE_ZAURUS_FONTHACK -ftemplate-depth-30
+CFLAGS = -pipe -Duint16_t="unsigned short" -Duint32_t="unsigned int" -DQT_QWS_EBX -DQT_QWS_CUSTOM -DQWS -fno-exceptions -fno-rtti -Wall -Wno-ctor-dtor-privacy -W -DUSE_ZAURUS_FONTHACK -ftemplate-depth-30
 LDFLAGS = -Wl,-rpath,$(LIBDIR),-rpath,/usr/lib
-
-XML_LIB = -lexpat
-ARCHIVER_LIB = -lz -lbz2
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/config.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/config.mk
--- fbreader-0.8.17/makefiles/config.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/config.mk	2009-04-30 22:26:45.000000000 +0100
@@ -12,6 +12,10 @@
 SHAREDIR ?= $(INSTALLDIR)/share
 BASEDIR ?= $(SHAREDIR)
 
+XML_LIBS ?= -lexpat
+ARCHIVER_LIBS ?= -lz -lbz2
+NETWORK_LIBS ?= -lcurl
+
 CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR)\" -DBASEDIR=\"$(BASEDIR)\" -DLIBDIR=\"$(LIBDIR)\" -DIMAGEDIR=\"$(IMAGEDIR)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR)\" -DVERSION=\"$(VERSION)\"
 ifeq "$(ZLSHARED)" "yes"
   CFLAGS += -fPIC -DZLSHARED
@@ -33,11 +37,11 @@
 ZLSHARED ?= yes
 
 ifeq "$(ZLSHARED)" "yes"
-  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore $(XML_LIB) $(ARCHIVER_LIB) -ldl
+  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/core -lzlcore -ldl
 	TEXT_LIBS = -lzltext
 else
-  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIB) $(ARCHIVER_LIB)
-	TEXT_LIBS = -lzltext -llinebreak
+  CORE_LIBS = -lm -L$(ROOTDIR)/zlibrary/ui -L$(ROOTDIR)/zlibrary/core -lzlcore -lzlui-$(UI_TYPE) -lzlcore $(UILIBS) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS)
+	TEXT_LIBS = -lzltext $(EXTERNAL_LIBS) -llinebreak -lfribidi
 endif
 
 ifneq "$(BUILD_RESOURCE_OBJECT)" "yes"
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/gtksubdir.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/gtksubdir.mk
--- fbreader-0.8.17/makefiles/gtksubdir.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/gtksubdir.mk	2009-04-30 22:26:45.000000000 +0100
@@ -1,17 +1,24 @@
 include $(ROOTDIR)/makefiles/config.mk
 
-INCLUDE = $(ZINCLUDE) $(EXTERNALINCLUDE) $(GTKINCLUDE)
+INCLUDE = $(ZINCLUDE) $(EXTERNAL_INCLUDE) $(GTKINCLUDE)
 
 HEADERS = $(wildcard *.h)
+CSOURCES = $(wildcard *.c)
 SOURCES = $(wildcard *.cpp)
-OBJECTS = $(patsubst %.cpp, %.o, $(SOURCES))
+OBJECTS = $(patsubst %.c, %.o, $(CSOURCES))
+OBJECTS += $(patsubst %.cpp, %.o, $(SOURCES))
 
-.SUFFIXES: .cpp .o .h
+.SUFFIXES: .c .cpp .o .h
+
+.c.o:
+	@echo -n 'Compiling $@ ...'
+	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
+	@echo ' OK'
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n 'Compiling $@ ...'
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
-	@echo " OK"
+	@echo ' OK'
 
 all: $(OBJECTS)
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/packaging.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/packaging.mk
--- fbreader-0.8.17/makefiles/packaging.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/packaging.mk	2009-04-30 22:26:45.000000000 +0100
@@ -1,9 +1,10 @@
 VERSION = $(shell cat fbreader/VERSION)
-SOVERSION = $(shell cat zlibrary/SOVERSION)
+SOVERSIONCORE = $(shell cat zlibrary/core/SOVERSION)
+SOVERSIONTEXT = $(shell cat zlibrary/text/SOVERSION)
 TMPDIR = $(CURDIR)/fbreader-$(VERSION)
 
 motopkg:
-	@echo -n "Building $(ARCHITECTURE) $@ package..."
+	@echo -n 'Building $(ARCHITECTURE) $@ package...'
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-$@.log 2>&1
 	@mkdir $(TMPDIR)
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) install 1>> $(ARCHITECTURE)-$@.log 2>&1
@@ -11,10 +12,10 @@
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1
 	@rm -rf $(TMPDIR)
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-$@.log
-	@echo " OK"
+	@echo ' OK'
 
 tarball:
-	@echo -n "Building $(ARCHITECTURE) $@ package..."
+	@echo -n 'Building $(ARCHITECTURE) $@ package...'
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-$@.log 2>&1
 	@mkdir $(TMPDIR)
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) install 1>> $(ARCHITECTURE)-$@.log 2>&1
@@ -22,26 +23,31 @@
 	@make -f $(DIST_DIR)/$@/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1
 	@rm -rf $(TMPDIR)
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-$@.log
-	@echo " OK"
+	@echo ' OK'
 
 debian:
-	@echo -n "Building $(ARCHITECTURE) debian package..."
+	@echo -n 'Building $(ARCHITECTURE) debian package...'
 	@mkdir $(TMPDIR)
 	@cp -a Makefile zlibrary fbreader makefiles $(TMPDIR)
 	@rm -rf `find $(TMPDIR) -name ".svn"`
 	@mkdir $(TMPDIR)/debian
 	@for file in $(DIST_DIR)/debian/$(ARCHITECTURE)/*; do \
-		sed -e "s#@SOVERSION@#$(SOVERSION)#g" $$file | \
-		sed -e "s#@VERSION@#$(VERSION)#g" > $(TMPDIR)/debian/`basename $$file`; \
-		chmod --reference $$file $(TMPDIR)/debian/`basename $$file`; \
+		if [ -f $$file ]; then \
+			sed -e "s#@SOVERSIONCORE@#$(SOVERSIONCORE)#g" $$file | \
+			sed -e "s#@SOVERSIONTEXT@#$(SOVERSIONTEXT)#g" | \
+			sed -e "s#@VERSION@#$(VERSION)#g" > $(TMPDIR)/debian/`basename $$file`; \
+			chmod --reference $$file $(TMPDIR)/debian/`basename $$file`; \
+		else \
+			cp -r $$file $(TMPDIR)/debian/`basename $$file`; \
+		fi; \
 	done
 	@cd $(TMPDIR); dpkg-buildpackage -rfakeroot -us -uc 1> $(CURDIR)/$(ARCHITECTURE)-debian.log 2>&1; cd $(CURDIR)
 	@rm -rf $(TMPDIR)
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-debian.log
-	@echo " OK"
+	@echo ' OK'
 
 ipk:
-	@echo -n "Building $(ARCHITECTURE) ipk package..."
+	@echo -n 'Building $(ARCHITECTURE) ipk package...'
 	@make -f $(DIST_DIR)/ipk/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-ipk.log 2>&1
 	@for controlfile in $(DIST_DIR)/ipk/$(ARCHITECTURE)/*.control; do \
 		controlname=`basename $$controlfile .control`; \
@@ -60,10 +66,10 @@
 	done
 	@make -f $(DIST_DIR)/ipk/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1;
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-ipk.log
-	@echo " OK"
+	@echo ' OK'
 
 debipk:
-	@echo -n "Building $(ARCHITECTURE) debipk package..."
+	@echo -n 'Building $(ARCHITECTURE) debipk package...'
 	@make -f $(DIST_DIR)/debipk/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-debipk.log 2>&1
 	@for controlfile in $(DIST_DIR)/debipk/$(ARCHITECTURE)/*.control; do \
 		controlname=`basename $$controlfile .control`; \
@@ -79,10 +85,10 @@
 	done
 	@make -f $(DIST_DIR)/debipk/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-debipk.log
-	@echo " OK"
+	@echo ' OK'
 
 nsi:
-	@echo -n "Building $(ARCHITECTURE) nsi package..."
+	@echo -n 'Building $(ARCHITECTURE) nsi package...'
 	@make -f $(DIST_DIR)/nsi/$(ARCHITECTURE)/rules build 1> $(ARCHITECTURE)-nsi.log 2>&1
 	@mkdir $(TMPDIR)
 	@make -f $(DIST_DIR)/nsi/$(ARCHITECTURE)/rules DESTDIR=$(TMPDIR) install 1>> $(ARCHITECTURE)-nsi.log 2>&1
@@ -92,4 +98,4 @@
 	@make -f $(DIST_DIR)/nsi/$(ARCHITECTURE)/rules clean 1> /dev/null 2>&1
 	@rm -rf $(TMPDIR)
 	@rm -f $(CURDIR)/$(ARCHITECTURE)-nsi.log
-	@echo " OK"
+	@echo ' OK'
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/qsubdir.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/qsubdir.mk
--- fbreader-0.8.17/makefiles/qsubdir.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/qsubdir.mk	2009-04-30 22:26:45.000000000 +0100
@@ -1,7 +1,7 @@
 include $(ROOTDIR)/makefiles/config.mk
 -include moc.mk
 
-INCLUDE = $(QTINCLUDE) $(ZINCLUDE) $(EXTERNALINCLUDE)
+INCLUDE = $(QTINCLUDE) $(ZINCLUDE) $(EXTERNAL_INCLUDE)
 
 HEADERS = $(wildcard *.h)
 SOURCES =	$(wildcard *.cpp)
@@ -11,14 +11,14 @@
 .SUFFIXES: .cpp .moc.cpp .moc.o .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n 'Compiling $@ ...'
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
-	@echo " OK"
+	@echo ' OK'
 
 .h.moc.cpp:
-	@echo -n "Generating $@ ..."
+	@echo -n 'Generating $@ ...'
 	@$(MOC) $< -o $@
-	@echo " OK"
+	@echo ' OK'
 
 all: $(OBJECTS) $(OBJMOC)
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/subdir.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/subdir.mk
--- fbreader-0.8.17/makefiles/subdir.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/subdir.mk	2009-04-30 22:26:45.000000000 +0100
@@ -1,6 +1,6 @@
 include $(ROOTDIR)/makefiles/config.mk
 
-INCLUDE = $(ZINCLUDE) $(EXTERNALINCLUDE)
+INCLUDE = $(ZINCLUDE) $(EXTERNAL_INCLUDE)
 
 HEADERS = $(wildcard *.h)
 SOURCES = $(wildcard *.cpp)
@@ -9,9 +9,9 @@
 .SUFFIXES: .cpp .o .h
 
 .cpp.o:
-	@echo -n "Compiling $@ ..."
+	@echo -n 'Compiling $@ ...'
 	@$(CC) -MMD -c $(CFLAGS) $(INCLUDE) $<
-	@echo " OK"
+	@echo ' OK'
 
 all: $(OBJECTS)
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/makefiles/target.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/makefiles/target.mk
--- fbreader-0.8.17/makefiles/target.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/makefiles/target.mk	2009-04-30 22:26:45.000000000 +0100
@@ -8,15 +8,17 @@
 #TARGET_ARCH = qvfb
 #UI_TYPE = opie
 
-#TARGET_ARCH = maemo
+TARGET_ARCH = maemo
 #UI_TYPE = maemo2
-#UI_TYPE = maemo4
+#UI_TYPE = maemo3
+UI_TYPE = maemo4
+#UI_TYPE = maemo5
 
 #TARGET_ARCH = ebr
 #UI_TYPE = nanoX
 
-TARGET_ARCH = desktop
-UI_TYPE = gtk
+#TARGET_ARCH = desktop
+#UI_TYPE = gtk
 #UI_TYPE = qt
 #UI_TYPE = qt4
 
@@ -48,4 +50,5 @@
 
 TARGET_STATUS = release
 #TARGET_STATUS = debug
+#ZLSHARED = no
 #TARGET_STATUS = profile
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/README.build /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/README.build
--- fbreader-0.8.17/README.build	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/README.build	2009-04-30 22:26:45.000000000 +0100
@@ -20,6 +20,8 @@
        GTK+ library, version >= 2.4 
      should be installed
   ** liblinebreak (http://vimgadgets.cvs.sourceforge.net/vimgadgets/common/tools/linebreak/) -- library for line breaking in a Unicode sequence
+  ** libfribidi -- for bidirectional text support
+  ** lincurl -- for network libraries integration
   ** for win32 version, we use also libpng, libungif, libjpeg and libtiff
 
 3. How to configure.
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/encodings/Encodings.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/encodings/Encodings.xml
--- fbreader-0.8.17/zlibrary/core/data/encodings/Encodings.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/encodings/Encodings.xml	2009-04-30 22:26:45.000000000 +0100
@@ -221,10 +221,14 @@
 	</group>
 	<group name="Unicode">
 		<encoding region="Unicode" name="UTF-8">
+			<code number="65001"/>
 		</encoding>
 		<encoding region="Unicode" name="UTF-7">
+			<code number="65000"/>
 		</encoding>
 		<encoding region="Unicode" name="UTF-16">
 		</encoding>
+		<encoding region="Unicode" name="UTF-16BE">
+		</encoding>
 	</group>
 </known-encodings>
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/languagePatterns.zip and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/languagePatterns.zip differ
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/ar.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/ar.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/ar.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/ar.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+	<node name="dialog">
+		<node name="button">
+			<node name="ok" value="&amp;موافق" />
+			<node name="cancel" value="&amp;ألغ" />
+			<node name="yes" value="&amp;نعم" />
+			<node name="no" value="&amp;لا" />
+			<node name="apply" value="&amp;طبّق" />
+		</node>
+		<node name="waitMessage">
+			<node name="savingConfig" value="يجري حفظ الإعدادات..." />
+		</node>
+		<node name="networkError">
+			<node name="title" toBeTranslated="true" value="Network error" />
+			<node name="unknownErrorMessage" toBeTranslated="true" value="Unknown error" />
+			<node name="couldntCreateDirectoryMessage" toBeTranslated="true" value="Couldn&apos;t create a directory&#10;%s" />
+			<node name="couldntCreateFileMessage" toBeTranslated="true" value="Couldn&apos;t create a file&#10;%s" />
+			<node name="couldntConnectMessage" toBeTranslated="true" value="Couldn&apos;t connect to host %s" />
+			<node name="couldntResolveHostMessage" toBeTranslated="true" value="Couldn&apos;t resolve host %s" />
+			<node name="couldntResolveProxyMessage" toBeTranslated="true" value="Couldn&apos;t resolve proxy %s" />
+			<node name="operationTimedOutMessage" toBeTranslated="true" value="Operation is timed out" />
+			<node name="somethingWrongMessage" toBeTranslated="true" value="Something goes wrong for&#10;%s" />
+		</node>
+	</node>
+	<node name="color">
+		<node name="red" value="أحمر" />
+		<node name="green" value="أخضر" />
+		<node name="blue" value="أزرق" />
+		<node name="black" value="أسود" />
+		<node name="white" value="أبيض" />
+		<node name="maroon" value="نبيذي" />
+		<node name="olive" value="زيتوني" />
+		<node name="navy" value="بحري" />
+		<node name="purple" value="بنفسجي" />
+		<node name="teal" value="كرنبي" />
+		<node name="silver" value="فضي" />
+		<node name="gray" value="رمادي" />
+		<node name="lime" value="ليموني" />
+		<node name="yellow" value="أصفر" />
+		<node name="magenta" value="قرمزي" />
+		<node name="cyan" value="سيان" />
+		<node name="custom..." value="مخصص..." />
+	</node>
+	<node name="language">
+		<node name="ar" value="العربية" />
+		<node name="cs" value="التشيكية" />
+		<node name="de" value="الألمانية" />
+		<node name="de-traditional" value="الألمانية (النظام التقليدي)" />
+		<node name="el" value="اليونانية" />
+		<node name="en" value="الإنجليزية" />
+		<node name="eo" value="الإسبر انتو" />
+		<node name="es" value="الأسبانية" />
+		<node name="fi" value="الفنلندية" />
+		<node name="fr" value="الفرنسية" />
+		<node name="he" value="العبرية" />
+		<node name="id" value="الإندونيسية" />
+		<node name="it" value="الإيطالية" />
+		<node name="no" value="النرويجية" />
+		<node name="pt" value="البرتغالية" />
+		<node name="ru" value="الروسية" />
+		<node name="tr" value="التركية" />
+		<node name="sv" value="السويدية" />
+		<node name="uk" value="الأكرانية" />
+		<node name="zh" value="الصينية" />
+		<node name="other" value="أخري" />
+	</node>
+	<node name="boolean3">
+		<node name="on" value="مفعّل" />
+		<node name="off" value="معطّل" />
+		<node name="unchanged" value="بدون تغيير" />
+	</node>
+	<node name="keyOptionView">
+		<node name="actionFor" value="إجراء الزر" />
+	</node>
+</resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/cs.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/cs.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/cs.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/cs.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Czech zlibrary resources, by Lubomír Čevela -->
+<resources>
+	<node name="dialog">
+		<node name="button">
+			<node name="ok" value="&amp;OK" />
+			<node name="cancel" value="&amp;Zrušit" />
+			<node name="yes" value="&amp;Ano" />
+			<node name="no" value="&amp;Ne" />
+			<node name="apply" value="&amp;Provést" />
+		</node>
+		<node name="waitMessage">
+			<node name="savingConfig" value="Ukládám nastavení..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Chyba sítě" />
+			<node name="unknownErrorMessage" value="Neznámá chyba" />
+			<node name="couldntCreateDirectoryMessage" value="Nepodařilo se vytvořit složku&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Nepodařilo se vytvořit soubor&#10;%s" />
+			<node name="couldntConnectMessage" value="Nepodařilo se připojit k serveru %s" />
+			<node name="couldntResolveHostMessage" value="Nepodařilo se najít server %s" />
+			<node name="couldntResolveProxyMessage" value="Nepodařilo se najít proxy %s" />
+			<node name="operationTimedOutMessage" value="Vypršel čas operace" />
+			<node name="somethingWrongMessage" value="Něco se nepodařilo&#10;%s" />
+		</node>
+	</node>
+	<node name="color">
+		<node name="red" value="Červená" />
+		<node name="green" value="Zelená" />
+		<node name="blue" value="Modrá" />
+		<node name="black" value="Černá" />
+		<node name="white" value="Bílá" />
+		<node name="maroon" value="Kaštanová" />
+		<node name="olive" value="Olivová" />
+		<node name="navy" value="Tmavě šedá" />
+		<node name="purple" value="Purpurová" />
+		<node name="teal" value="Teal" />
+		<node name="silver" value="Stříbrná" />
+		<node name="gray" value="Šedá" />
+		<node name="lime" value="Světle zelená" />
+		<node name="yellow" value="Žlutá" />
+		<node name="magenta" value="Purpurová" />
+		<node name="cyan" value="Modrozelená" />
+		<node name="custom..." value="Uživatelská..." />
+	</node>
+	<node name="language">
+		<node name="ar" value="Arabsky" />
+		<node name="cs" value="Česky" />
+		<node name="de" value="Německy" />
+		<node name="de-traditional" value="Německy (tradiční pravopis)" />
+		<node name="el" value="Řecky" />
+		<node name="en" value="Anglicky" />
+		<node name="eo" value="Esperanto" />
+		<node name="es" value="Španělsky" />
+		<node name="fi" value="Finsky" />
+		<node name="fr" value="Francouzsky" />
+		<node name="he" value="Hebrejsky" />
+		<node name="id" value="Indonézsky" />
+		<node name="it" value="Italsky" />
+		<node name="no" value="Norsky" />
+		<node name="pt" value="Portugalsky" />
+		<node name="ru" value="Rusky" />
+		<node name="tr" value="Turecky" />
+		<node name="sv" value="Švédsky" />
+		<node name="uk" value="Ukrajinsky" />
+		<node name="zh" value="Čínsky" />
+		<node name="other" value="Jiný" />
+	</node>
+	<node name="boolean3">
+		<node name="on" value="zapnuto" />
+		<node name="off" value="vypnuto" />
+		<node name="unchanged" value="beze změn" />
+	</node>
+	<node name="keyOptionView">
+		<node name="actionFor" value="Akce pro" />
+	</node>
+</resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/en.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/en.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/en.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/en.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,60 +2,76 @@
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;Ok"/>
-			<node name="cancel" value="&amp;Cancel"/>
-			<node name="yes" value="&amp;Yes"/>
-			<node name="no" value="&amp;No"/>
-			<node name="apply" value="&amp;Apply"/>
+			<node name="ok" value="&amp;Ok" />
+			<node name="cancel" value="&amp;Cancel" />
+			<node name="yes" value="&amp;Yes" />
+			<node name="no" value="&amp;No" />
+			<node name="apply" value="&amp;Apply" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Saving config..."/>
+			<node name="savingConfig" value="Saving config..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Network error" />
+			<node name="unknownErrorMessage" value="Unknown error" />
+			<node name="couldntCreateDirectoryMessage" value="Couldn&apos;t create a directory&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Couldn&apos;t create a file&#10;%s" />
+			<node name="couldntConnectToNetworkMessage" value="Couldn&apos;t connect to the network" />
+			<node name="couldntConnectMessage" value="Couldn&apos;t connect to host %s" />
+			<node name="couldntResolveHostMessage" value="Couldn&apos;t resolve host %s" />
+			<node name="couldntResolveProxyMessage" value="Couldn&apos;t resolve proxy %s" />
+			<node name="operationTimedOutMessage" value="Operation is timed out" />
+			<node name="somethingWrongMessage" value="Something goes wrong for&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Red"/>
-		<node name="green" value="Green"/>
-		<node name="blue" value="Blue"/>
-		<node name="black" value="Black"/>
-		<node name="white" value="White"/>
-		<node name="maroon" value="Maroon"/>
-		<node name="olive" value="Olive"/>
-		<node name="navy" value="Navy"/>
-		<node name="purple" value="Purple"/>
-		<node name="teal" value="Teal"/>
-		<node name="silver" value="Silver"/>
-		<node name="gray" value="Gray"/>
-		<node name="lime" value="Lime"/>
-		<node name="yellow" value="Yellow"/>
-		<node name="magenta" value="Magenta"/>
-		<node name="cyan" value="Cyan"/>
-		<node name="custom..." value="Custom..."/>
+		<node name="red" value="Red" />
+		<node name="green" value="Green" />
+		<node name="blue" value="Blue" />
+		<node name="black" value="Black" />
+		<node name="white" value="White" />
+		<node name="maroon" value="Maroon" />
+		<node name="olive" value="Olive" />
+		<node name="navy" value="Navy" />
+		<node name="purple" value="Purple" />
+		<node name="teal" value="Teal" />
+		<node name="silver" value="Silver" />
+		<node name="gray" value="Gray" />
+		<node name="lime" value="Lime" />
+		<node name="yellow" value="Yellow" />
+		<node name="magenta" value="Magenta" />
+		<node name="cyan" value="Cyan" />
+		<node name="custom..." value="Custom..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Czech"/>
-		<node name="de" value="German"/>
-		<node name="de-traditional" value="German (traditional orthography)"/>
-		<node name="en" value="English"/>
-		<node name="eo" value="Esperanto"/>
-		<node name="es" value="Spanish"/>
-		<node name="fi" value="Finnish"/>
-		<node name="fr" value="French"/>
-		<node name="id" value="Indonesian"/>
-		<node name="it" value="Italian"/>
-		<node name="no" value="Norwegian"/>
-		<node name="pt" value="Portuguese"/>
-		<node name="ru" value="Russian"/>
-		<node name="sv" value="Swedish"/>
-		<node name="uk" value="Ukrainian"/>
-		<node name="zh" value="Chinese"/>
-		<node name="other" value="Other"/>
+		<node name="ar" value="Arabic" />
+		<node name="cs" value="Czech" />
+		<node name="de" value="German" />
+		<node name="de-traditional" value="German (traditional orthography)" />
+		<node name="el" value="Greek" />
+		<node name="en" value="English" />
+		<node name="eo" value="Esperanto" />
+		<node name="es" value="Spanish" />
+		<node name="fi" value="Finnish" />
+		<node name="fr" value="French" />
+		<node name="he" value="Hebrew" />
+		<node name="id" value="Indonesian" />
+		<node name="it" value="Italian" />
+		<node name="no" value="Norwegian" />
+		<node name="pt" value="Portuguese" />
+		<node name="ru" value="Russian" />
+		<node name="sv" value="Swedish" />
+		<node name="tr" value="Turkish" />
+		<node name="uk" value="Ukrainian" />
+		<node name="zh" value="Chinese" />
+		<node name="other" value="Other" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="on"/>
-		<node name="off" value="off"/>
-		<node name="unchanged" value="unchanged"/>
+		<node name="on" value="on" />
+		<node name="off" value="off" />
+		<node name="unchanged" value="unchanged" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Action for Key"/>
+		<node name="actionFor" value="Action for Key" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/fi.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/fi.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/fi.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/fi.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Finnish zlibrary resources, by Marko Vertainen -->
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;Ok"/>
-			<node name="cancel" value="&amp;Peruuta"/>
-			<node name="yes" value="&amp;Kyllä"/>
-			<node name="no" value="&amp;Ei"/>
-			<node name="apply" value="&amp;Toteuta"/>
+			<node name="ok" value="&amp;Ok" />
+			<node name="cancel" value="&amp;Peruuta" />
+			<node name="yes" value="&amp;Kyllä" />
+			<node name="no" value="&amp;Ei" />
+			<node name="apply" value="&amp;Toteuta" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Tallennetaan asetuksia..."/>
+			<node name="savingConfig" value="Tallennetaan asetuksia..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Verkkovirhe" />
+			<node name="unknownErrorMessage" value="Tuntematon virhe" />
+			<node name="couldntCreateDirectoryMessage" value="Ei voitu luoda hakemistoa&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Ei voitu luoda tiedostoa&#10;%s" />
+			<node name="couldntConnectMessage" value="Ei voitu yhdistää palvelimeen %s" />
+			<node name="couldntResolveHostMessage" value="Ei tunnistettu palvelinta %s" />
+			<node name="couldntResolveProxyMessage" value="Ei tunnistettu välityspalvelinta %s" />
+			<node name="operationTimedOutMessage" value="Toiminto aikakatkaistiin" />
+			<node name="somethingWrongMessage" value="Jokin meni pieleen&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Punainen"/>
-		<node name="green" value="Vihreä"/>
-		<node name="blue" value="Sininen"/>
-		<node name="black" value="Musta"/>
-		<node name="white" value="Valkoinen"/>
-		<node name="maroon" value="Kastanjanruskea"/>
-		<node name="olive" value="Oliivinvihreä"/>
-		<node name="navy" value="Tummansininen"/>
-		<node name="purple" value="Purppura"/>
-		<node name="teal" value="Sinivihreä"/>
-		<node name="silver" value="Hopea"/>
-		<node name="gray" value="Harmaa"/>
-		<node name="lime" value="Kellanvihreä"/>
-		<node name="yellow" value="Keltainen"/>
-		<node name="magenta" value="Magenta"/>
-		<node name="cyan" value="Syaani"/>
-		<node name="custom..." value="Valinnainen..."/>
+		<node name="red" value="Punainen" />
+		<node name="green" value="Vihreä" />
+		<node name="blue" value="Sininen" />
+		<node name="black" value="Musta" />
+		<node name="white" value="Valkoinen" />
+		<node name="maroon" value="Kastanjanruskea" />
+		<node name="olive" value="Oliivinvihreä" />
+		<node name="navy" value="Tummansininen" />
+		<node name="purple" value="Purppura" />
+		<node name="teal" value="Sinivihreä" />
+		<node name="silver" value="Hopea" />
+		<node name="gray" value="Harmaa" />
+		<node name="lime" value="Kellanvihreä" />
+		<node name="yellow" value="Keltainen" />
+		<node name="magenta" value="Magenta" />
+		<node name="cyan" value="Syaani" />
+		<node name="custom..." value="Valinnainen..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Tsekki"/>
-		<node name="de" value="Saksa"/>
-		<node name="de-traditional" value="Saksa (perinteinen oikeinkirjoitus)"/>
-		<node name="en" value="Englanti"/>
-		<node name="eo" value="Esperanto"/>
-		<node name="es" value="Espanja"/>
-		<node name="fi" value="Suomi"/>
-		<node name="fr" value="Ranska"/>
-		<node name="id" value="Indonesia"/>
-		<node name="it" value="Italia"/>
-		<node name="no" value="Norja"/>
-		<node name="pt" value="Portugali"/>
-		<node name="ru" value="Venäjä"/>
-		<node name="sv" value="Ruotsi"/>
-		<node name="uk" value="Ukraina"/>
-		<node name="zh" value="Kiina"/>
-		<node name="other" value="Muu"/>
+		<node name="ar" value="Arabia" />
+		<node name="cs" value="Tsekki" />
+		<node name="de" value="Saksa" />
+		<node name="de-traditional" value="Saksa (perinteinen oikeinkirjoitus)" />
+		<node name="el" value="Kreikka" />
+		<node name="en" value="Englanti" />
+		<node name="eo" value="Esperanto" />
+		<node name="es" value="Espanja" />
+		<node name="fi" value="Suomi" />
+		<node name="fr" value="Ranska" />
+		<node name="he" value="Heprea" />
+		<node name="id" value="Indonesia" />
+		<node name="it" value="Italia" />
+		<node name="no" value="Norja" />
+		<node name="pt" value="Portugali" />
+		<node name="ru" value="Venäjä" />
+		<node name="tr" value="Turkki" />
+		<node name="sv" value="Ruotsi" />
+		<node name="uk" value="Ukraina" />
+		<node name="zh" value="Kiina" />
+		<node name="other" value="Muu" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="on"/>
-		<node name="off" value="off"/>
-		<node name="unchanged" value="ei muutoksia"/>
+		<node name="on" value="on" />
+		<node name="off" value="off" />
+		<node name="unchanged" value="ei muutoksia" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Toiminta näppäimelle"/>
+		<node name="actionFor" value="Toiminta näppäimelle" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/fr.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/fr.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/fr.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/fr.xml	2009-04-30 22:26:45.000000000 +0100
@@ -3,60 +3,75 @@
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="O&amp;k"/>
-			<node name="cancel" value="A&amp;nnuler"/>
-			<node name="yes" value="&amp;Oui"/>
-			<node name="no" value="&amp;Non"/>
-			<node name="apply" value="&amp;Appliquer"/>
+			<node name="ok" value="O&amp;k" />
+			<node name="cancel" value="A&amp;nnuler" />
+			<node name="yes" value="&amp;Oui" />
+			<node name="no" value="&amp;Non" />
+			<node name="apply" value="&amp;Appliquer" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Enregistrement de la configuration..."/>
+			<node name="savingConfig" value="Enregistrement de la configuration..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Erreur réseau" />
+			<node name="unknownErrorMessage" value="Erreur inconnue" />
+			<node name="couldntCreateDirectoryMessage" value="Impossible de créer un répertoire&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Impossible de créer un fichier&#10;%s" />
+			<node name="couldntConnectMessage" value="Impossible de se connecter à l&apos;hôte %s" />
+			<node name="couldntResolveHostMessage" value="Résolution du nom %s impossible" />
+			<node name="couldntResolveProxyMessage" value="Résolution du proxy %s impossible" />
+			<node name="operationTimedOutMessage" value="Le délai réseau a expiré" />
+			<node name="somethingWrongMessage" value="Il y a un problème avec&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Rouge"/>
-		<node name="green" value="Vert"/>
-		<node name="blue" value="Bleu"/>
-		<node name="black" value="Noir"/>
-		<node name="white" value="Blanc"/>
-		<node name="maroon" value="Marron"/>
-		<node name="olive" value="Vert olive"/>
-		<node name="navy" value="Bleu marine"/>
-		<node name="purple" value="Violet"/>
-		<node name="teal" value="Bleu canard"/>
-		<node name="silver" value="Argent"/>
-		<node name="gray" value="Gris"/>
-		<node name="lime" value="Vert clair"/>
-		<node name="yellow" value="Jaune"/>
-		<node name="magenta" value="Magenta"/>
-		<node name="cyan" value="Cyan"/>
-		<node name="custom..." value="Personnalisé..."/>
+		<node name="red" value="Rouge" />
+		<node name="green" value="Vert" />
+		<node name="blue" value="Bleu" />
+		<node name="black" value="Noir" />
+		<node name="white" value="Blanc" />
+		<node name="maroon" value="Marron" />
+		<node name="olive" value="Vert olive" />
+		<node name="navy" value="Bleu marine" />
+		<node name="purple" value="Violet" />
+		<node name="teal" value="Bleu canard" />
+		<node name="silver" value="Argent" />
+		<node name="gray" value="Gris" />
+		<node name="lime" value="Vert clair" />
+		<node name="yellow" value="Jaune" />
+		<node name="magenta" value="Magenta" />
+		<node name="cyan" value="Cyan" />
+		<node name="custom..." value="Personnalisé..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Tchèque"/>
-		<node name="de" value="Allemand"/>
-		<node name="de-traditional" value="Allemand (l'orthographie traditionelle)"/>
-		<node name="en" value="Anglais"/>
-		<node name="eo" value="Espéranto"/>
-		<node name="es" value="Espagnol"/>
-		<node name="fi" value="Finnois"/>
-		<node name="fr" value="Français"/>
-		<node name="id" value="Indonesian" toBeTranslated="true"/>
-		<node name="it" value="Italien"/>
-		<node name="no" value="Norvégien"/>
-		<node name="pt" value="Portugais"/>
-		<node name="ru" value="Russe"/>
-		<node name="sv" value="Suédois"/>
-		<node name="uk" value="Ukrainien"/>
-		<node name="zh" value="Chinois"/>
-		<node name="other" value="Autre"/>
+		<node name="ar" value="Arabe" />
+		<node name="cs" value="Tchèque" />
+		<node name="de" value="Allemand" />
+		<node name="de-traditional" value="Allemand (l&apos;orthographie traditionelle)" />
+		<node name="el" value="Grec" />
+		<node name="en" value="Anglais" />
+		<node name="eo" value="Espéranto" />
+		<node name="es" value="Espagnol" />
+		<node name="fi" value="Finnois" />
+		<node name="fr" value="Français" />
+		<node name="he" value="Hébreu" />
+		<node name="id" value="Indonésien" />
+		<node name="it" value="Italien" />
+		<node name="no" value="Norvégien" />
+		<node name="pt" value="Portugais" />
+		<node name="ru" value="Russe" />
+		<node name="tr" value="Turc" />
+		<node name="sv" value="Suédois" />
+		<node name="uk" value="Ukrainien" />
+		<node name="zh" value="Chinois" />
+		<node name="other" value="Autre" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="activé"/>
-		<node name="off" value="désactivé"/>
-		<node name="unchanged" value="unchanged"/>
+		<node name="on" value="activé" />
+		<node name="off" value="désactivé" />
+		<node name="unchanged" value="unchanged" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Action pour la touche"/>
+		<node name="actionFor" value="Action pour la touche" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/id.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/id.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/id.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/id.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Indonesian zlibrary resources, by Ketut Putu Kumajaya -->
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;OK"/>
-			<node name="cancel" value="&amp;Batal"/>
-			<node name="yes" value="&amp;Ya"/>
-			<node name="no" value="&amp;Tidak"/>
-			<node name="apply" value="&amp;Terapkan"/>
+			<node name="ok" value="&amp;OK" />
+			<node name="cancel" value="&amp;Batal" />
+			<node name="yes" value="&amp;Ya" />
+			<node name="no" value="&amp;Tidak" />
+			<node name="apply" value="&amp;Terapkan" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Menyimpan pengaturan..."/>
+			<node name="savingConfig" value="Menyimpan pengaturan..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Jaringan bermasalah" />
+			<node name="unknownErrorMessage" value="Masalah tidak diketahui" />
+			<node name="couldntCreateDirectoryMessage" value="Tidak dapat membuat direktori&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Tidak dapat membuat berkas&#10;%s" />
+			<node name="couldntConnectMessage" value="Tidak dapat menghubungi alamat %s" />
+			<node name="couldntResolveHostMessage" value="Tidak dapat menerjemahkan alamat %s" />
+			<node name="couldntResolveProxyMessage" value="Tidak dapat menerjemahkan proxy %s" />
+			<node name="operationTimedOutMessage" value="Waktu tunggu operasi terlampaui" />
+			<node name="somethingWrongMessage" value="Terjadi sesuatu yang salah pada&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Merah"/>
-		<node name="green" value="Hijau"/>
-		<node name="blue" value="Biru"/>
-		<node name="black" value="Hitam"/>
-		<node name="white" value="Putih"/>
-		<node name="maroon" value="Merah Tua"/>
-		<node name="olive" value="Hijau Kekuningan"/>
-		<node name="navy" value="Biru Tua"/>
-		<node name="purple" value="Ungu"/>
-		<node name="teal" value="Teal"/>
-		<node name="silver" value="Perak"/>
-		<node name="gray" value="Abu-abu"/>
-		<node name="lime" value="Lime"/>
-		<node name="yellow" value="Kuning"/>
-		<node name="magenta" value="Merah Keunguan"/>
-		<node name="cyan" value="Biru Muda"/>
-		<node name="custom..." value="Kustom..."/>
+		<node name="red" value="Merah" />
+		<node name="green" value="Hijau" />
+		<node name="blue" value="Biru" />
+		<node name="black" value="Hitam" />
+		<node name="white" value="Putih" />
+		<node name="maroon" value="Merah Gelap" />
+		<node name="olive" value="Hijau Kekuningan" />
+		<node name="navy" value="Biru Gelap" />
+		<node name="purple" value="Ungu" />
+		<node name="teal" value="Hijau Kebiruan" />
+		<node name="silver" value="Perak" />
+		<node name="gray" value="Abu-abu" />
+		<node name="lime" value="Hijau Terang" />
+		<node name="yellow" value="Kuning" />
+		<node name="magenta" value="Merah Keunguan" />
+		<node name="cyan" value="Biru Terang" />
+		<node name="custom..." value="Kustom..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Cekoslowakia"/>
-		<node name="de" value="Jerman"/>
-		<node name="de-traditional" value="Jerman (tradisionil)"/>
-		<node name="en" value="Inggris"/>
-		<node name="eo" value="Esperanto"/>
-		<node name="es" value="Spanyol"/>
-		<node name="fi" value="Finlandia"/>
-		<node name="fr" value="Perancis"/>
-		<node name="id" value="Indonesia"/>
-		<node name="it" value="Italia"/>
-		<node name="no" value="Norwegia"/>
-		<node name="pt" value="Portugis"/>
-		<node name="ru" value="Rusia"/>
-		<node name="sv" value="Swedia"/>
-		<node name="uk" value="Ukraina"/>
-		<node name="zh" value="Cina"/>
-		<node name="other" value="Lainnya"/>
+		<node name="ar" value="Arab" />
+		<node name="cs" value="Cekoslowakia" />
+		<node name="de" value="Jerman" />
+		<node name="de-traditional" value="Jerman (tradisionil)" />
+		<node name="el" value="Yunani" />
+		<node name="en" value="Inggris" />
+		<node name="eo" value="Esperanto" />
+		<node name="es" value="Spanyol" />
+		<node name="fi" value="Finlandia" />
+		<node name="fr" value="Perancis" />
+		<node name="he" value="Ibrani" />
+		<node name="id" value="Indonesia" />
+		<node name="it" value="Italia" />
+		<node name="no" value="Norwegia" />
+		<node name="pt" value="Portugis" />
+		<node name="ru" value="Rusia" />
+		<node name="sv" value="Swedia" />
+		<node name="tr" value="Turki" />
+		<node name="uk" value="Ukraina" />
+		<node name="zh" value="Cina" />
+		<node name="other" value="Lainnya" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="Hidup"/>
-		<node name="off" value="Mati"/>
-		<node name="unchanged" value="tidak berubah"/>
+		<node name="on" value="Hidup" />
+		<node name="off" value="Mati" />
+		<node name="unchanged" value="tidak berubah" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Aksi Tombol"/>
+		<node name="actionFor" value="Aksi Tombol" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/it.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/it.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/it.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/it.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Italian zlibrary resources, by Floriano Scioscia -->
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;Ok"/>
-			<node name="cancel" value="&amp;Annulla"/>
-			<node name="yes" value="&amp;S&igrave;"/>
-			<node name="no" value="&amp;No"/>
-			<node name="apply" value="&amp;Applica"/>
+			<node name="ok" value="&amp;Ok" />
+			<node name="cancel" value="&amp;Annulla" />
+			<node name="yes" value="&amp;Sì" />
+			<node name="no" value="&amp;No" />
+			<node name="apply" value="&amp;Applica" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Salvataggio configurazione..."/>
+			<node name="savingConfig" value="Salvataggio configurazione..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Errore di rete" />
+			<node name="unknownErrorMessage" value="Errore sconosciuto" />
+			<node name="couldntCreateDirectoryMessage" value="Impossibile creare una cartella&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Impossibile creare un file&#10;%s" />
+			<node name="couldntConnectMessage" value="Impossibile connettersi all&apos;host %s" />
+			<node name="couldntResolveHostMessage" value="Impossibile trovare l&apos;host %s" />
+			<node name="couldntResolveProxyMessage" value="Impossibile trovare il proxy %s" />
+			<node name="operationTimedOutMessage" value="Tempo scaduto per l&apos;operazione" />
+			<node name="somethingWrongMessage" value="Qualcosa va storto per&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Rosso"/>
-		<node name="green" value="Verde"/>
-		<node name="blue" value="Blu"/>
-		<node name="black" value="Nero"/>
-		<node name="white" value="Bianco"/>
-		<node name="maroon" value="Marrone"/>
-		<node name="olive" value="Oliva"/>
-		<node name="navy" value="Blu scuro"/>
-		<node name="purple" value="Viola"/>
-		<node name="teal" value="Verde-azzurro"/>
-		<node name="silver" value="Argento"/>
-		<node name="gray" value="Grigio"/>
-		<node name="lime" value="Verde-giallo"/>
-		<node name="yellow" value="Giallo"/>
-		<node name="magenta" value="Magenta"/>
-		<node name="cyan" value="Ciano"/>
-		<node name="custom..." value="Personalizzato..."/>
+		<node name="red" value="Rosso" />
+		<node name="green" value="Verde" />
+		<node name="blue" value="Blu" />
+		<node name="black" value="Nero" />
+		<node name="white" value="Bianco" />
+		<node name="maroon" value="Marrone" />
+		<node name="olive" value="Oliva" />
+		<node name="navy" value="Blu scuro" />
+		<node name="purple" value="Viola" />
+		<node name="teal" value="Verde-azzurro" />
+		<node name="silver" value="Argento" />
+		<node name="gray" value="Grigio" />
+		<node name="lime" value="Verde-giallo" />
+		<node name="yellow" value="Giallo" />
+		<node name="magenta" value="Magenta" />
+		<node name="cyan" value="Ciano" />
+		<node name="custom..." value="Personalizzato..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Ceco"/>
-		<node name="de" value="Tedesco"/>
-		<node name="de-traditional" value="Tedesco (ortografia tradizionale)"/>
-		<node name="en" value="Inglese"/>
-		<node name="eo" value="Esperanto"/>
-		<node name="es" value="Spagnolo"/>
-		<node name="fi" value="Finlandese"/>
-		<node name="fr" value="Francese"/>
-		<node name="id" value="Indonesian" toBeTranslated="true"/>
-		<node name="it" value="Italiano"/>
-		<node name="no" value="Norvegese"/>
-		<node name="pt" value="Portoghese"/>
-		<node name="ru" value="Russo"/>
-		<node name="sv" value="Svedese"/>
-		<node name="uk" value="Ucraino"/>
-		<node name="zh" value="Cinese"/>
-		<node name="other" value="Altra"/>
+		<node name="ar" value="Arabo" />
+		<node name="cs" value="Ceco" />
+		<node name="de" value="Tedesco" />
+		<node name="de-traditional" value="Tedesco (ortografia tradizionale)" />
+		<node name="el" value="Greco" />
+		<node name="en" value="Inglese" />
+		<node name="eo" value="Esperanto" />
+		<node name="es" value="Spagnolo" />
+		<node name="fi" value="Finlandese" />
+		<node name="fr" value="Francese" />
+		<node name="he" value="Ebraico" />
+		<node name="id" value="Indonesiano" />
+		<node name="it" value="Italiano" />
+		<node name="no" value="Norvegese" />
+		<node name="pt" value="Portoghese" />
+		<node name="ru" value="Russo" />
+		<node name="tr" value="Turco" />
+		<node name="sv" value="Svedese" />
+		<node name="uk" value="Ucraino" />
+		<node name="zh" value="Cinese" />
+		<node name="other" value="Altra" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="on"/>
-		<node name="off" value="off"/>
-		<node name="unchanged" value="invariato"/>
+		<node name="on" value="on" />
+		<node name="off" value="off" />
+		<node name="unchanged" value="invariato" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Azione del Tasto"/>
+		<node name="actionFor" value="Azione del Tasto" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/ru.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/ru.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/ru.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/ru.xml	2009-04-30 22:26:45.000000000 +0100
@@ -2,60 +2,76 @@
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;ОК"/>
-			<node name="cancel" value="О&amp;тменить"/>
-			<node name="yes" value="&amp;Да"/>
-			<node name="no" value="&amp;Нет"/>
-			<node name="apply" value="При&amp;менить"/>
+			<node name="ok" value="&amp;ОК" />
+			<node name="cancel" value="О&amp;тменить" />
+			<node name="yes" value="&amp;Да" />
+			<node name="no" value="&amp;Нет" />
+			<node name="apply" value="При&amp;менить" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Сохранение настроек..."/>
+			<node name="savingConfig" value="Сохранение настроек..." />
+		</node>
+		<node name="networkError">
+			<node name="title" value="Ошибка при работе с сетью" />
+			<node name="unknownErrorMessage" value="Неизвестная ошибка" />
+			<node name="couldntCreateDirectoryMessage" value="Не удалось создать каталог&#10;%s" />
+			<node name="couldntCreateFileMessage" value="Не удалось создать файл&#10;%s" />
+			<node name="couldntConnectToNetworkMessage" value="Не удалось соединиться с сетью" />
+			<node name="couldntConnectMessage" value="Не удалось соединиться с сайтом %s" />
+			<node name="couldntResolveHostMessage" value="Не удается найти сайт %s" />
+			<node name="couldntResolveProxyMessage" value="Не удается найти прокси-сервер %s" />
+			<node name="operationTimedOutMessage" value="Отведенное время истекло" />
+			<node name="somethingWrongMessage" value="Ошибка при работе с&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Красный"/>
-		<node name="green" value="Зеленый"/>
-		<node name="blue" value="Синий"/>
-		<node name="black" value="Черный"/>
-		<node name="white" value="Белый"/>
-		<node name="maroon" value="Бордовый"/>
-		<node name="olive" value="Оливковый"/>
-		<node name="navy" value="Темно-синий"/>
-		<node name="purple" value="Фиолетовый"/>
-		<node name="teal" value="Темно-голубой"/>
-		<node name="silver" value="Серебристый"/>
-		<node name="gray" value="Серый"/>
-		<node name="lime" value="Светло-зеленый"/>
-		<node name="yellow" value="Желтый"/>
-		<node name="magenta" value="Пурпурный"/>
-		<node name="cyan" value="Голубой"/>
-		<node name="custom..." value="Настроить..."/>
+		<node name="red" value="Красный" />
+		<node name="green" value="Зеленый" />
+		<node name="blue" value="Синий" />
+		<node name="black" value="Черный" />
+		<node name="white" value="Белый" />
+		<node name="maroon" value="Бордовый" />
+		<node name="olive" value="Оливковый" />
+		<node name="navy" value="Темно-синий" />
+		<node name="purple" value="Фиолетовый" />
+		<node name="teal" value="Темно-голубой" />
+		<node name="silver" value="Серебристый" />
+		<node name="gray" value="Серый" />
+		<node name="lime" value="Светло-зеленый" />
+		<node name="yellow" value="Желтый" />
+		<node name="magenta" value="Пурпурный" />
+		<node name="cyan" value="Голубой" />
+		<node name="custom..." value="Настроить..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="чешский"/>
-		<node name="de" value="немецкий"/>
-		<node name="de-traditional" value="немецкий (старая орфография)"/>
-		<node name="en" value="английский"/>
-		<node name="eo" value="эсперанто"/>
-		<node name="es" value="испанский"/>
-		<node name="fi" value="финский"/>
-		<node name="fr" value="французский"/>
-		<node name="id" value="индонезийский"/>
-		<node name="it" value="итальянский"/>
-		<node name="no" value="норвежский"/>
-		<node name="pt" value="португальский"/>
-		<node name="ru" value="русский"/>
-		<node name="sv" value="шведский"/>
-		<node name="uk" value="украинский"/>
-		<node name="zh" value="китайский"/>
-		<node name="other" value="другой"/>
+		<node name="ar" value="арабский" />
+		<node name="cs" value="чешский" />
+		<node name="de" value="немецкий" />
+		<node name="de-traditional" value="немецкий (старая орфография)" />
+		<node name="el" value="греческий" />
+		<node name="en" value="английский" />
+		<node name="eo" value="эсперанто" />
+		<node name="es" value="испанский" />
+		<node name="fi" value="финский" />
+		<node name="fr" value="французский" />
+		<node name="he" value="иврит" />
+		<node name="id" value="индонезийский" />
+		<node name="it" value="итальянский" />
+		<node name="no" value="норвежский" />
+		<node name="pt" value="португальский" />
+		<node name="ru" value="русский" />
+		<node name="tr" value="турецкий" />
+		<node name="sv" value="шведский" />
+		<node name="uk" value="украинский" />
+		<node name="zh" value="китайский" />
+		<node name="other" value="другой" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="включить"/>
-		<node name="off" value="выключить"/>
-		<node name="unchanged" value="не менять"/>
+		<node name="on" value="включить" />
+		<node name="off" value="выключить" />
+		<node name="unchanged" value="не менять" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Действие для"/>
+		<node name="actionFor" value="Действие для" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/sv.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/sv.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/sv.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/sv.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,61 +1,77 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Swedish zlibrary resources, by Daniel Nylander -->
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;Ok"/>
-			<node name="cancel" value="&amp;Avbryt"/>
-			<node name="yes" value="&amp;Ja"/>
-			<node name="no" value="&amp;Nej"/>
-			<node name="apply" value="&amp;Verkställ"/>
+			<node name="ok" value="&amp;Ok" />
+			<node name="cancel" value="&amp;Avbryt" />
+			<node name="yes" value="&amp;Ja" />
+			<node name="no" value="&amp;Nej" />
+			<node name="apply" value="&amp;Verkställ" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Sparar konfiguration..."/>
+			<node name="savingConfig" value="Sparar konfiguration..." />
+		</node>
+		<node name="networkError">
+			<node name="title" toBeTranslated="true" value="Network error" />
+			<node name="unknownErrorMessage" toBeTranslated="true" value="Unknown error" />
+			<node name="couldntCreateDirectoryMessage" toBeTranslated="true" value="Couldn&apos;t create a directory&#10;%s" />
+			<node name="couldntCreateFileMessage" toBeTranslated="true" value="Couldn&apos;t create a file&#10;%s" />
+			<node name="couldntConnectMessage" toBeTranslated="true" value="Couldn&apos;t connect to host %s" />
+			<node name="couldntResolveHostMessage" toBeTranslated="true" value="Couldn&apos;t resolve host %s" />
+			<node name="couldntResolveProxyMessage" toBeTranslated="true" value="Couldn&apos;t resolve proxy %s" />
+			<node name="operationTimedOutMessage" toBeTranslated="true" value="Operation is timed out" />
+			<node name="somethingWrongMessage" toBeTranslated="true" value="Something goes wrong for&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Röd"/>
-		<node name="green" value="Grön"/>
-		<node name="blue" value="Blå"/>
-		<node name="black" value="Svart"/>
-		<node name="white" value="Vit"/>
-		<node name="maroon" value="Mörk brun"/>
-		<node name="olive" value="Oliv"/>
-		<node name="navy" value="Marin"/>
-		<node name="purple" value="Lila"/>
-		<node name="teal" value="Teal"/>
-		<node name="silver" value="Silver"/>
-		<node name="gray" value="Grå"/>
-		<node name="lime" value="Lime"/>
-		<node name="yellow" value="Gul"/>
-		<node name="magenta" value="Magenta"/>
-		<node name="cyan" value="Cyan"/>
-		<node name="custom..." value="Anpassad..."/>
+		<node name="red" value="Röd" />
+		<node name="green" value="Grön" />
+		<node name="blue" value="Blå" />
+		<node name="black" value="Svart" />
+		<node name="white" value="Vit" />
+		<node name="maroon" value="Mörk brun" />
+		<node name="olive" value="Oliv" />
+		<node name="navy" value="Marin" />
+		<node name="purple" value="Lila" />
+		<node name="teal" value="Teal" />
+		<node name="silver" value="Silver" />
+		<node name="gray" value="Grå" />
+		<node name="lime" value="Lime" />
+		<node name="yellow" value="Gul" />
+		<node name="magenta" value="Magenta" />
+		<node name="cyan" value="Cyan" />
+		<node name="custom..." value="Anpassad..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Tjeckiska"/>
-		<node name="de" value="Tyska"/>
-		<node name="de-traditional" value="Tyska (traditionell ortografi)"/>
-		<node name="en" value="Engelska"/>
-		<node name="eo" value="Esperanto"/>
-		<node name="es" value="Spanska"/>
-		<node name="fi" value="Finska"/>
-		<node name="fr" value="Franska"/>
-		<node name="id" value="Indonesian" toBeTranslated="true"/>
-		<node name="it" value="Italienska"/>
-		<node name="no" value="Norska"/>
-		<node name="pt" value="Portugisiska"/>
-		<node name="ru" value="Ryska"/>
-		<node name="sv" value="Svenska"/>
-		<node name="uk" value="Ukrainska"/>
-		<node name="zh" value="Kinesiska"/>
-		<node name="other" value="Annat"/>
+		<node name="ar" value="Arabiska" />
+		<node name="cs" value="Tjeckiska" />
+		<node name="de" value="Tyska" />
+		<node name="de-traditional" value="Tyska (traditionell ortografi)" />
+		<node name="el" value="Grekiska" />
+		<node name="en" value="Engelska" />
+		<node name="eo" value="Esperanto" />
+		<node name="es" value="Spanska" />
+		<node name="fi" value="Finska" />
+		<node name="fr" value="Franska" />
+		<node name="he" value="Hebreiska" />
+		<node name="id" value="Indonesiska" />
+		<node name="it" value="Italienska" />
+		<node name="no" value="Norska" />
+		<node name="pt" value="Portugisiska" />
+		<node name="ru" value="Ryska" />
+		<node name="tr" value="Turkiska" />
+		<node name="sv" value="Svenska" />
+		<node name="uk" value="Ukrainska" />
+		<node name="zh" value="Kinesiska" />
+		<node name="other" value="Annat" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="på"/>
-		<node name="off" value="av"/>
-		<node name="unchanged" value="oförändrat"/>
+		<node name="on" value="på" />
+		<node name="off" value="av" />
+		<node name="unchanged" value="oförändrat" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Åtgärd för tangent"/>
+		<node name="actionFor" value="Åtgärd för tangent" />
 	</node>
 </resources>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/resources/uk.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/resources/uk.xml
--- fbreader-0.8.17/zlibrary/core/data/resources/uk.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/data/resources/uk.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,61 +1,77 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Ukrainian zlibrary resources, by Valentina Kanevska -->
 <resources>
 	<node name="dialog">
 		<node name="button">
-			<node name="ok" value="&amp;Гаразд"/>
-			<node name="cancel" value="С&amp;касувати"/>
-			<node name="yes" value="&amp;Так"/>
-			<node name="no" value="&amp;Ні"/>
-			<node name="apply" value="Заст&amp;осувати"/>
+			<node name="ok" value="&amp;Гаразд" />
+			<node name="cancel" value="С&amp;касувати" />
+			<node name="yes" value="&amp;Так" />
+			<node name="no" value="&amp;Ні" />
+			<node name="apply" value="Заст&amp;осувати" />
 		</node>
 		<node name="waitMessage">
-			<node name="savingConfig" value="Збереження налаштувань..."/>
+			<node name="savingConfig" value="Збереження налаштувань..." />
+		</node>
+		<node name="networkError">
+			<node name="title" toBeTranslated="true" value="Network error" />
+			<node name="unknownErrorMessage" toBeTranslated="true" value="Unknown error" />
+			<node name="couldntCreateDirectoryMessage" toBeTranslated="true" value="Couldn&apos;t create a directory&#10;%s" />
+			<node name="couldntCreateFileMessage" toBeTranslated="true" value="Couldn&apos;t create a file&#10;%s" />
+			<node name="couldntConnectMessage" toBeTranslated="true" value="Couldn&apos;t connect to host %s" />
+			<node name="couldntResolveHostMessage" toBeTranslated="true" value="Couldn&apos;t resolve host %s" />
+			<node name="couldntResolveProxyMessage" toBeTranslated="true" value="Couldn&apos;t resolve proxy %s" />
+			<node name="operationTimedOutMessage" toBeTranslated="true" value="Operation is timed out" />
+			<node name="somethingWrongMessage" toBeTranslated="true" value="Something goes wrong for&#10;%s" />
 		</node>
 	</node>
 	<node name="color">
-		<node name="red" value="Червоний"/>
-		<node name="green" value="Зелений"/>
-		<node name="blue" value="Синій"/>
-		<node name="black" value="Чорний"/>
-		<node name="white" value="Білий"/>
-		<node name="maroon" value="Брунатний"/>
-		<node name="olive" value="Оливковий"/>
-		<node name="navy" value="Темно-синій"/>
-		<node name="purple" value="Фіолетовий"/>
-		<node name="teal" value="Темно-блакитний"/>
-		<node name="silver" value="Сріблястий"/>
-		<node name="gray" value="Сірий"/>
-		<node name="lime" value="Світло-зелений"/>
-		<node name="yellow" value="Жовтий"/>
-		<node name="magenta" value="Пурпурний"/>
-		<node name="cyan" value="Блакитний"/>
-		<node name="custom..." value="Налаштувати..."/>
+		<node name="red" value="Червоний" />
+		<node name="green" value="Зелений" />
+		<node name="blue" value="Синій" />
+		<node name="black" value="Чорний" />
+		<node name="white" value="Білий" />
+		<node name="maroon" value="Брунатний" />
+		<node name="olive" value="Оливковий" />
+		<node name="navy" value="Темно-синій" />
+		<node name="purple" value="Фіолетовий" />
+		<node name="teal" value="Темно-блакитний" />
+		<node name="silver" value="Сріблястий" />
+		<node name="gray" value="Сірий" />
+		<node name="lime" value="Світло-зелений" />
+		<node name="yellow" value="Жовтий" />
+		<node name="magenta" value="Пурпурний" />
+		<node name="cyan" value="Блакитний" />
+		<node name="custom..." value="Налаштувати..." />
 	</node>
 	<node name="language">
-		<node name="cs" value="Чеська"/>
-		<node name="de" value="Німецька"/>
-		<node name="de-traditional" value="Німецька (традiцiйна орфографiя)"/>
-		<node name="en" value="Англійська"/>
-		<node name="eo" value="Есперанто"/>
-		<node name="es" value="Іспанська"/>
-		<node name="fi" value="Фінська"/>
-		<node name="fr" value="Французька"/>
-		<node name="id" value="Indonesian" toBeTranslated="true"/>
-		<node name="it" value="Італійська"/>
-		<node name="no" value="Норвезька"/>
-		<node name="pt" value="Португальська"/>
-		<node name="ru" value="Російська"/>
-		<node name="sv" value="Шведська"/>
-		<node name="uk" value="Українська"/>
-		<node name="zh" value="Китайська"/>
-		<node name="other" value="Інша"/>
+		<node name="ar" value="Арабська" />
+		<node name="cs" value="Чеська" />
+		<node name="de" value="Німецька" />
+		<node name="de-traditional" value="Німецька (традiцiйна орфографiя)" />
+		<node name="el" value="Грецька" />
+		<node name="en" value="Англійська" />
+		<node name="eo" value="Есперанто" />
+		<node name="es" value="Іспанська" />
+		<node name="fi" value="Фінська" />
+		<node name="fr" value="Французька" />
+		<node name="he" value="Гебрейська" />
+		<node name="id" value="Індонезійська" />
+		<node name="it" value="Італійська" />
+		<node name="no" value="Норвезька" />
+		<node name="pt" value="Португальська" />
+		<node name="ru" value="Російська" />
+		<node name="tr" value="Турецька" />
+		<node name="sv" value="Шведська" />
+		<node name="uk" value="Українська" />
+		<node name="zh" value="Китайська" />
+		<node name="other" value="Інша" />
 	</node>
 	<node name="boolean3">
-		<node name="on" value="ввімкнути"/>
-		<node name="off" value="вимкнути"/>
-		<node name="unchanged" value="не змінювати"/>
+		<node name="on" value="ввімкнути" />
+		<node name="off" value="вимкнути" />
+		<node name="unchanged" value="не змінювати" />
 	</node>
 	<node name="keyOptionView">
-		<node name="actionFor" value="Дія для"/>
+		<node name="actionFor" value="Дія для" />
 	</node>
 </resources>
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/data/unicode.xml.gz and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/data/unicode.xml.gz differ
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/allocator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/allocator.h
--- fbreader-0.8.17/zlibrary/core/include/allocator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/allocator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLColorOptionBuilder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLColorOptionBuilder.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLColorOptionBuilder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLColorOptionBuilder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLFontFamilyOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLFontFamilyOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLFontFamilyOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLFontFamilyOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLLanguageOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLLanguageOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLLanguageOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLLanguageOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLSimpleKeyOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLSimpleKeyOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLSimpleKeyOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLSimpleKeyOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLSimpleOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLSimpleOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLSimpleOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLSimpleOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLStringInfoEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLStringInfoEntry.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLStringInfoEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLStringInfoEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLToggleBooleanOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLToggleBooleanOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/include/optionEntries/ZLToggleBooleanOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/optionEntries/ZLToggleBooleanOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/shared_ptr.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/shared_ptr.h
--- fbreader-0.8.17/zlibrary/core/include/shared_ptr.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/shared_ptr.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLApplication.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLApplication.h
--- fbreader-0.8.17/zlibrary/core/include/ZLApplication.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLApplication.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,24 +27,23 @@
 
 #include <shared_ptr.h>
 #include <ZLOptions.h>
-#include <ZLOptionEntry.h>
 #include <ZLTime.h>
 #include <ZLResource.h>
 #include <ZLMessage.h>
+#include <ZLView.h>
 
-class ZLView;
 class ZLViewWidget;
 class ZLPaintContext;
 class ZLKeyBindings;
+class ZLToolbar;
+class ZLPopupData;
+class ZLMenubar;
 
 class ZLApplicationBase {
 
 protected:
 	ZLApplicationBase(const std::string &name);
 	~ZLApplicationBase();
-
-private:
-	std::string replaceRegExps(const std::string &pattern);
 };
 
 class ZLApplication : public ZLApplicationBase {
@@ -71,8 +70,8 @@
 
 	public:
 		virtual ~Action();
-		virtual bool isVisible();
-		virtual bool isEnabled();
+		virtual bool isVisible() const;
+		virtual bool isEnabled() const;
 		void checkAndRun();
 		virtual bool useKeyDelay() const;
 
@@ -85,7 +84,7 @@
 
 	public:
 		RotationAction(ZLApplication &application);
-		bool isVisible();
+		bool isVisible() const;
 		void run();
 
 	private:
@@ -93,221 +92,18 @@
 	};
 	friend class RotationAction;
 	
+public:
 	class FullscreenAction : public Action {
 
 	public:
-		FullscreenAction(ZLApplication &application, bool toggle);
-		bool isVisible();
+		FullscreenAction(ZLApplication &application);
 		void run();
 
 	private:
 		ZLApplication &myApplication;
-		bool myIsToggle;
 	};
 	friend class FullscreenAction;
 	
-public:
-
-	class Toolbar {
-
-	public:
-		class Item {
-
-		public:
-			enum Type {
-				BUTTON,
-				OPTION_ENTRY,
-				SEPARATOR
-			};
-
-		public:
-			Item();
-			virtual ~Item();
-
-			virtual Type type() const = 0;
-
-		friend class Toolbar;
-		};
-	
-		class ButtonGroup;
-
-		class ButtonItem : public Item {
-
-		public:
-			ButtonItem(const std::string &actionId, const ZLResource &tooltip);
-
-			Type type() const;
-
-			const std::string &actionId() const;
-			const std::string &iconName() const;
-			const std::string &tooltip() const;
-
-			shared_ptr<ButtonGroup> buttonGroup() const;
-			bool isToggleButton() const;
-			void press();
-			bool isPressed() const;
-
-		private:
-			void setButtonGroup(shared_ptr<ButtonGroup>);
-
-		private:
-			const std::string myActionId;
-			const ZLResource &myTooltip;
-			shared_ptr<ButtonGroup> myButtonGroup;
-
-		friend class Toolbar;
-		};
-	
-		struct ButtonGroup {
-
-		private:
-			ButtonGroup(const std::string &unselectAllButtonsActionId);
-			void press(const ButtonItem *item);
-
-		private:
-			const std::string UnselectAllButtonsActionId;
-			std::set<const ButtonItem*> Items;
-			const ButtonItem *PressedItem;
-
-		friend class ButtonItem;
-		friend class Toolbar;
-		friend class ZLApplicationWindow;
-		};
-
-		class SeparatorItem : public Item {
-
-		public:
-			Type type() const;
-		};
-
-		class OptionEntryItem : public Item {
-
-		public:
-			OptionEntryItem(shared_ptr<ZLOptionEntry> entry);
-			Type type() const;
-			shared_ptr<ZLOptionEntry> entry() const;
-
-		private:
-			shared_ptr<ZLOptionEntry> myOptionEntry;
-		};
-
-	public:
-		typedef shared_ptr<Item> ItemPtr;
-		typedef std::vector<ItemPtr> ItemVector;
-
-		Toolbar();
-		void addButton(const std::string &actionId, shared_ptr<ButtonGroup> group = 0);
-		shared_ptr<ButtonGroup> createButtonGroup(const std::string &unselectAllButtonsActionId);
-		void addOptionEntry(shared_ptr<ZLOptionEntry> entry);
-		void addSeparator();
-
-		const ItemVector &items() const;
-
-	private:
-		ItemVector myItems;
-		const ZLResource &myResource;
-
-	friend class ZLApplication;
-	};
-
-	class Menu {
-
-	public:
-		class Item {
-
-		public:
-			enum ItemType {
-				ITEM,
-				SUBMENU,
-				SEPARATOR
-			};
-			
-		public:
-			virtual ~Item();
-			ItemType type() const;
-
-		protected:
-			Item(ItemType type);
-
-		private:
-			const ItemType myType;
-		};
-
-		typedef shared_ptr<Item> ItemPtr;
-		typedef std::vector<ItemPtr> ItemVector;
-
-		void addItem(const std::string &actionId, const ZLResourceKey &key);
-		void addSeparator();
-		ItemPtr addSubmenu(const ZLResourceKey &key);
-
-		const ItemVector &items() const;
-
-		virtual ~Menu();
-
-	protected:
-		Menu(const ZLResource &resource);
-
-	protected:
-		const ZLResource &myResource;
-
-	private:
-		ItemVector myItems;
-
-	friend class ZLApplication;
-	};
-
-	class Menubar : public Menu {
-
-	public:
-		class PlainItem : public Menu::Item {
-
-		public:
-			PlainItem(const std::string &name, const std::string &actionId);
-
-			const std::string &name() const;
-			const std::string &actionId() const;
-
-		private:
-			const std::string myName;
-			const std::string myActionId;
-		};
-
-		class Submenu : public Menu::Item, public Menu {
-
-		public:
-			Submenu(const ZLResource &resource);
-
-			const std::string &menuName() const;
-		};
-
-		class Separator : public Menu::Item {
-
-		public:
-			Separator();
-		};
-
-	public:
-		Menubar();
-
-	friend class ZLApplication;
-	};
-
-	class MenuVisitor {
-
-	public:
-		virtual ~MenuVisitor();
-		void processMenu(ZLApplication &application);
-
-	private:
-		void processMenu(ZLApplication::Menu &menu);
-
-	protected:
-		virtual void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu) = 0;
-		virtual void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu) = 0;
-		virtual void processItem(ZLApplication::Menubar::PlainItem &item) = 0;
-		virtual void processSepartor(ZLApplication::Menubar::Separator &separator) = 0;
-	};
-
 	class PresentWindowHandler : public ZLMessageHandler {
 
 	public:
@@ -325,13 +121,14 @@
 	ZLApplication(const std::string &name);
 
 	void addAction(const std::string &actionId, shared_ptr<Action> action);
+	void registerPopupData(const std::string &actionId, shared_ptr<ZLPopupData> popupData);
 
 	void setView(shared_ptr<ZLView> view);
 	shared_ptr<ZLView> currentView() const;
+	ZLView::Angle rotation() const;
 
 	void setFullscreen(bool fullscreen);
 	bool isFullscreen() const;
-	void resetWindowCaption();
 	void quit();
 
 public:
@@ -343,6 +140,7 @@
 	void grabAllKeys(bool grab);
 	void trackStylus(bool track);
 
+	void resetWindowCaption();
 	void setHyperlinkCursor(bool hyperlink);
 
 	shared_ptr<Action> action(const std::string &actionId) const;
@@ -350,16 +148,13 @@
 	bool isActionEnabled(const std::string &actionId) const;
 	void doAction(const std::string &actionId);
 
-	virtual ZLKeyBindings &keyBindings() = 0;	
+	virtual shared_ptr<ZLKeyBindings> keyBindings();	
 	void doActionByKey(const std::string &key);
 
 	virtual bool closeView();
 	virtual void openFile(const std::string &fileName);
 
-	// TODO in 1.0: replace by virtual method
-	bool isViewFinal() const;
-	// TODO in 1.0: remove
-	void setViewFinal(bool final);
+	virtual bool isViewFinal() const;
 
 	void refreshWindow();
 	void presentWindow();
@@ -367,33 +162,35 @@
 	const std::string &lastCaller() const;
 	void resetLastCaller();
 
+	void setVisualParameter(const std::string &id, const std::string &value);
+	void setParameterValueList(const std::string &id, const std::vector<std::string> &values);
+	const std::string &visualParameter(const std::string &id);
+
 private:
-	void createToolbar();
+	void createToolbar(int index);
+
+// TODO: change access rights to private
 public:
-	// TODO: change to private
-	const Toolbar &toolbar() const;
+	const ZLToolbar &toolbar(int index) const;
 
 private:
 	void createMenubar();
-	const Menubar &menubar() const;
-
-protected:
-	ZLViewWidget *myViewWidget;
+	const ZLMenubar &menubar() const;
 
 private:
+	ZLViewWidget *myViewWidget;
 	shared_ptr<ZLView> myInitialView;
 	std::map<std::string,shared_ptr<Action> > myActionMap;
-	Toolbar myToolbar;
-	Menubar myMenubar;
+	mutable shared_ptr<ZLToolbar> myToolbar;
+	mutable shared_ptr<ZLToolbar> myFullscreenToolbar;
+	mutable shared_ptr<ZLMenubar> myMenubar;
 	shared_ptr<ZLPaintContext> myContext;
 	class ZLApplicationWindow *myWindow;
 	ZLTime myLastKeyActionTime;
 	shared_ptr<ZLMessageHandler> myPresentWindowHandler;
-	// TODO in 1.0: change to non-static
-	static bool myIsViewFinal;
 
 friend class ZLApplicationWindow;
-friend class MenuVisitor;
+friend class ZLMenuVisitor;
 };
 
 #endif /* __ZLAPPLICATION_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLBoolean3.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLBoolean3.h
--- fbreader-0.8.17/zlibrary/core/include/ZLBoolean3.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLBoolean3.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLColor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLColor.h
--- fbreader-0.8.17/zlibrary/core/include/ZLColor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLColor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLDialogContent.h
--- fbreader-0.8.17/zlibrary/core/include/ZLDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLDialog.h
--- fbreader-0.8.17/zlibrary/core/include/ZLDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLDialogManager.h
--- fbreader-0.8.17/zlibrary/core/include/ZLDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 class ZLOptionsDialog;
 class ZLTreeHandler;
 class ZLApplication;
+class ZLImageData;
 
 class ZLDialogManager {
 
@@ -71,9 +72,12 @@
 	virtual bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const = 0;
 
 	void informationBox(const ZLResourceKey &key) const;
-	virtual void informationBox(const ZLResourceKey &key, const std::string &message) const = 0;
+	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	virtual void informationBox(const std::string &title, const std::string &message) const = 0;
+
 	void errorBox(const ZLResourceKey &key) const;
 	virtual void errorBox(const ZLResourceKey &key, const std::string &message) const = 0;
+
 	int questionBox(const ZLResourceKey &key, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2 = ZLResourceKey()) const;
 	virtual int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2 = ZLResourceKey()) const = 0;
 
@@ -85,6 +89,7 @@
 	};
 	virtual bool isClipboardSupported(ClipboardType type) const = 0;
 	virtual void setClipboardText(const std::string &text, ClipboardType type) const = 0;
+	virtual void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const = 0;
 };
 
 #endif /* __ZLDIALOGMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLDir.h
--- fbreader-0.8.17/zlibrary/core/include/ZLDir.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLDir.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLEncodingConverter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLEncodingConverter.h
--- fbreader-0.8.17/zlibrary/core/include/ZLEncodingConverter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLEncodingConverter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLFile.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLFile.h
--- fbreader-0.8.17/zlibrary/core/include/ZLFile.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLFile.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #define __ZLFILE_H__
 
 #include <string>
+#include <map>
 
 #include <shared_ptr.h>
 #include <ZLFileInfo.h>
@@ -31,6 +32,9 @@
 
 class ZLFile {
 
+private:
+	static std::map<std::string,weak_ptr<ZLInputStream> > ourPlainStreamCache;
+
 public:
 	static std::string fileNameToUtf8(const std::string &fileName);
 
@@ -50,10 +54,10 @@
 	~ZLFile();
 
 	bool exists() const;
-	unsigned long mTime() const;
 	size_t size() const;	
 
 	void forceArchiveType(ArchiveType type);
+
 	bool isCompressed() const;
 	bool isDirectory() const;
 	bool isArchive() const;
@@ -65,6 +69,7 @@
 	const std::string &extension() const;
 
 	std::string physicalFilePath() const;
+	std::string resolvedPath() const;
 
 	shared_ptr<ZLInputStream> inputStream() const;
 	shared_ptr<ZLOutputStream> outputStream() const;
@@ -72,6 +77,7 @@
 
 private:
 	void fillInfo() const;
+	shared_ptr<ZLInputStream> envelopeCompressedStream(shared_ptr<ZLInputStream> &base) const;
 
 private:
 	std::string myPath;
@@ -85,12 +91,7 @@
 
 inline ZLFile::~ZLFile() {}
 
-inline bool ZLFile::exists() const { if (!myInfoIsFilled) fillInfo(); return myInfo.Exists; }
-inline unsigned long ZLFile::mTime() const { if (!myInfoIsFilled) fillInfo(); return myInfo.MTime; }
-inline size_t ZLFile::size() const { if (!myInfoIsFilled) fillInfo(); return myInfo.Size; }
-	
 inline bool ZLFile::isCompressed() const { return myArchiveType & COMPRESSED; }
-inline bool ZLFile::isDirectory() const { if (!myInfoIsFilled) fillInfo(); return myInfo.IsDirectory; }
 inline bool ZLFile::isArchive() const { return myArchiveType & ARCHIVE; }
 
 inline const std::string &ZLFile::path() const { return myPath; }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLFileImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLFileImage.h
--- fbreader-0.8.17/zlibrary/core/include/ZLFileImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLFileImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLFileInfo.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLFileInfo.h
--- fbreader-0.8.17/zlibrary/core/include/ZLFileInfo.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLFileInfo.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 struct ZLFileInfo {
 	bool Exists;
 	bool IsDirectory;
-	unsigned long MTime;
 	unsigned long Size;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLibrary.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLibrary.h
--- fbreader-0.8.17/zlibrary/core/include/ZLibrary.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLibrary.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 	static const std::string PathDelimiter;
 	static const std::string EndOfLine;
 	static std::string Language();
+	static std::string Country();
 
 	static const std::string BaseDirectory;
 	static const std::string &ZLibraryDirectory();
@@ -50,7 +51,12 @@
 	static void shutdown();
 
 private:
+	static void initLocale();
+
+private:
+	static bool ourLocaleIsInitialized;
 	static std::string ourLanguage;
+	static std::string ourCountry;
 	static std::string ourZLibraryDirectory;
 
 	static std::string ourImageDirectory;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLImage.h
--- fbreader-0.8.17/zlibrary/core/include/ZLImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLImageManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLImageManager.h
--- fbreader-0.8.17/zlibrary/core/include/ZLImageManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLImageManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLInputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLInputStream.h
--- fbreader-0.8.17/zlibrary/core/include/ZLInputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLInputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,10 @@
 
 #include <string>
 
-class ZLInputStream {
+#include <shared_ptr.h>
+#include <ZLUserData.h>
+
+class ZLInputStream : public ZLUserDataHolder {
 
 protected:
 	ZLInputStream();
@@ -43,6 +46,25 @@
 	const ZLInputStream &operator = (const ZLInputStream&);
 };
 
+class ZLInputStreamDecorator : public ZLInputStream {
+
+public:
+	ZLInputStreamDecorator(shared_ptr<ZLInputStream> decoratee);
+
+private:
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	shared_ptr<ZLInputStream> myBaseStream;
+	size_t myBaseOffset;
+};
+
 inline ZLInputStream::ZLInputStream() {}
 inline ZLInputStream::~ZLInputStream() {}
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLKeyBindings.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLKeyBindings.h
--- fbreader-0.8.17/zlibrary/core/include/ZLKeyBindings.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLKeyBindings.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLLanguageDetector.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLLanguageDetector.h
--- fbreader-0.8.17/zlibrary/core/include/ZLLanguageDetector.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLLanguageDetector.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLLanguageList.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLLanguageList.h
--- fbreader-0.8.17/zlibrary/core/include/ZLLanguageList.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLLanguageList.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,11 +27,10 @@
 class ZLLanguageList {
 
 public:
+	static std::string patternsDirectoryPath();
 	static const std::vector<std::string> &languageCodes();
 	static std::string languageName(const std::string &code);
 
-	static shared_ptr<ZLDir> patternsDirectory();
-
 private:
 	static std::vector<std::string> ourLanguageCodes;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLLanguageUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLLanguageUtil.h
--- fbreader-0.8.17/zlibrary/core/include/ZLLanguageUtil.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLLanguageUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLLANGUAGEUTIL_H__
+#define __ZLLANGUAGEUTIL_H__
+
+#include <string>
+
+class ZLLanguageUtil {
+
+private:
+	ZLLanguageUtil();
+
+public:
+	static std::string languageByCode(unsigned char languageCode, unsigned char subLanguageCode);
+	static bool isRTLLanguage(const std::string &languageCode);
+};
+
+#endif /* __ZLLANGUAGEUTIL_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLMessage.h
--- fbreader-0.8.17/zlibrary/core/include/ZLMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLNetworkData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkData.h
--- fbreader-0.8.17/zlibrary/core/include/ZLNetworkData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKDATA_H__
+#define __ZLNETWORKDATA_H__
+
+#include <curl/curl.h>
+
+#include <string>
+
+class ZLNetworkData {
+
+protected:
+	ZLNetworkData(const std::string &url);
+
+public:
+	virtual ~ZLNetworkData();
+	const std::string &url() const;
+	CURL *handle();
+
+private:
+	const std::string myURL;
+	CURL *myHandle;
+};
+
+#endif /* __ZLNETWORKDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLNetworkManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkManager.h
--- fbreader-0.8.17/zlibrary/core/include/ZLNetworkManager.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKMANAGER_H__
+#define __ZLNETWORKMANAGER_H__
+
+#include <string>
+#include <vector>
+
+#include <shared_ptr.h>
+#include <ZLOptions.h>
+#include <ZLNetworkData.h>
+
+class ZLNetworkManager {
+
+public:
+	static void deleteInstance();
+	static ZLNetworkManager &instance();
+
+protected:
+	static ZLNetworkManager *ourInstance;
+	
+public:
+	ZLIntegerRangeOption &ConnectTimeoutOption() const;
+	ZLIntegerRangeOption &TimeoutOption() const;
+	ZLBooleanOption &UseProxyOption() const;
+	ZLStringOption &ProxyHostOption() const;
+	ZLStringOption &ProxyPortOption() const;
+
+protected:
+	ZLNetworkManager();
+	virtual ~ZLNetworkManager();
+
+public:
+	virtual bool connect() const;
+	virtual void release() const;
+
+	virtual bool providesProxyInfo() const;
+
+protected:
+	virtual bool useProxy() const;
+	virtual std::string proxyHost() const;
+	virtual std::string proxyPort() const;
+
+public:
+	// returns error message
+	std::string downloadFile(const std::string &url, const std::string &fileName) const;
+	// returns error message
+	std::string perform(const std::vector<shared_ptr<ZLNetworkData> > &dataList) const;
+
+private:
+	void setStandardOptions(CURL *handle, const std::string &proxy) const;
+
+	mutable shared_ptr<ZLIntegerRangeOption> myConnectTimeoutOption;
+	mutable shared_ptr<ZLIntegerRangeOption> myTimeoutOption;
+	mutable shared_ptr<ZLBooleanOption> myUseProxyOption;
+	mutable shared_ptr<ZLStringOption> myProxyHostOption;
+	mutable shared_ptr<ZLStringOption> myProxyPortOption;
+};
+
+#endif /* __ZLNETWORKMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLNetworkUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkUtil.h
--- fbreader-0.8.17/zlibrary/core/include/ZLNetworkUtil.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKUTIL_H__
+#define __ZLNETWORKUTIL_H__
+
+#include <string>
+
+class ZLNetworkUtil {
+
+public:
+	static std::string htmlEncode(const std::string &stringToEncode);
+	static std::string hostFromUrl(const std::string &url);
+
+private:
+	ZLNetworkUtil();
+};
+
+#endif /* __ZLNETWORKUTIL_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLNetworkXMLParserData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkXMLParserData.h
--- fbreader-0.8.17/zlibrary/core/include/ZLNetworkXMLParserData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLNetworkXMLParserData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKXMLPARSERDATA_H__
+#define __ZLNETWORKXMLPARSERDATA_H__
+
+#include <shared_ptr.h>
+
+#include "ZLNetworkData.h"
+
+class ZLXMLReader;
+
+class ZLNetworkXMLParserData : public ZLNetworkData {
+
+public:
+	ZLNetworkXMLParserData(const std::string &url, shared_ptr<ZLXMLReader> reader);
+	~ZLNetworkXMLParserData();
+
+private:
+	shared_ptr<ZLXMLReader> myReader;
+};
+
+#endif /* __ZLNETWORKXMLPARSERDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/include/ZLOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLOptionsDialog.h
--- fbreader-0.8.17/zlibrary/core/include/ZLOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLOptions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLOptions.h
--- fbreader-0.8.17/zlibrary/core/include/ZLOptions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLOptions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
 	static const ZLCategoryKey CONFIG;
 	static const ZLCategoryKey STATE;
 	static const ZLCategoryKey SYSTEM;
+	static const ZLCategoryKey NETWORK;
 
 protected:
 	explicit ZLCategoryKey(const std::string &name);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLOutputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLOutputStream.h
--- fbreader-0.8.17/zlibrary/core/include/ZLOutputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLOutputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 public:
 	virtual ~ZLOutputStream();
 	virtual bool open() = 0;
+	virtual void write(const char *data, size_t len) = 0;
 	virtual void write(const std::string &str) = 0;
 	virtual void close() = 0;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLPaintContext.h
--- fbreader-0.8.17/zlibrary/core/include/ZLPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,21 +38,13 @@
 		SOLID_FILL,
 		HALF_FILL,
 	};
-	
+
 protected:
 	ZLPaintContext();
 
 public:
 	virtual ~ZLPaintContext();
 
-	int x() const;
-	int y() const;
-
-	void moveXTo(int x);
-	void moveX(int deltaX);
-	void moveYTo(int y);
-	void moveY(int deltaY);
-
 	virtual void clear(ZLColor color) = 0;
 
 	virtual void setFont(const std::string &family, int size, bool bold, bool italic) = 0;
@@ -62,11 +54,11 @@
 	virtual int width() const = 0;
 	virtual int height() const = 0;
 	
-	virtual int stringWidth(const char *str, int len) const = 0;
+	virtual int stringWidth(const char *str, int len, bool rtl) const = 0;
 	virtual int spaceWidth() const = 0;
 	virtual int stringHeight() const = 0;
 	virtual int descent() const = 0;
-	virtual void drawString(int x, int y, const char *str, int len) = 0;
+	virtual void drawString(int x, int y, const char *str, int len, bool rtl) = 0;
 
 	int imageWidth(const ZLImageData &image) const;
 	int imageHeight(const ZLImageData &image) const;
@@ -83,8 +75,6 @@
 	virtual void fillFamiliesList(std::vector<std::string> &families) const = 0;
 
 private:
-	int myX, myY;
-
 	mutable std::vector<std::string> myFamilies;
 
 private:
@@ -94,14 +84,6 @@
 friend class ZLPartialPaintContext;
 };
 
-inline int ZLPaintContext::x() const { return myX; }
-inline int ZLPaintContext::y() const { return myY; }
-
-inline void ZLPaintContext::moveXTo(int x) { myX = x; }
-inline void ZLPaintContext::moveX(int deltaX) { myX += deltaX; }
-inline void ZLPaintContext::moveYTo(int y) { myY = y; }
-inline void ZLPaintContext::moveY(int deltaY) { myY += deltaY; }
-
 inline int ZLPaintContext::imageWidth(const ZLImageData &image) const { return image.width(); }
 inline int ZLPaintContext::imageHeight(const ZLImageData &image) const { return image.height(); }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLPopupData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLPopupData.h
--- fbreader-0.8.17/zlibrary/core/include/ZLPopupData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLPopupData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLPOPUPDATA_H__
+#define __ZLPOPUPDATA_H__
+
+#include <string>
+
+class ZLPopupData {
+
+public:
+	virtual ~ZLPopupData();
+
+	virtual size_t id() const = 0;
+	virtual size_t count() const = 0;
+	virtual const std::string text(size_t index) = 0;
+	virtual void run(size_t index) = 0;
+};
+
+inline ZLPopupData::~ZLPopupData() {
+}
+
+#endif /* __ZLPOPUPDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLResource.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLResource.h
--- fbreader-0.8.17/zlibrary/core/include/ZLResource.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLResource.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLRunnable.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLRunnable.h
--- fbreader-0.8.17/zlibrary/core/include/ZLRunnable.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLRunnable.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLSearchUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLSearchUtil.h
--- fbreader-0.8.17/zlibrary/core/include/ZLSearchUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLSearchUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLSelectionDialog.h
--- fbreader-0.8.17/zlibrary/core/include/ZLSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLSplittedView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLSplittedView.h
--- fbreader-0.8.17/zlibrary/core/include/ZLSplittedView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLSplittedView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #ifndef __ZLSPLITTEDVIEW_H__
 #define __ZLSPLITTEDVIEW_H__
 
+#include <ZLColor.h>
 #include <ZLView.h>
 
 class ZLSplittedView : public ZLView {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLStreamImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLStreamImage.h
--- fbreader-0.8.17/zlibrary/core/include/ZLStreamImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLStreamImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLStringUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLStringUtil.h
--- fbreader-0.8.17/zlibrary/core/include/ZLStringUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLStringUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLTime.h
--- fbreader-0.8.17/zlibrary/core/include/ZLTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLUnicodeUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLUnicodeUtil.h
--- fbreader-0.8.17/zlibrary/core/include/ZLUnicodeUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLUnicodeUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #ifndef __ZLUNICODEUTIL_H__
 #define __ZLUNICODEUTIL_H__
 
+#include <stdint.h>
 #include <string>
 #include <vector>
 
@@ -29,8 +30,10 @@
 	ZLUnicodeUtil();
 
 public:
-	typedef unsigned short Ucs2Char;
+	typedef uint16_t Ucs2Char;
 	typedef std::vector<Ucs2Char> Ucs2String;
+	typedef uint32_t Ucs4Char;
+	typedef std::vector<Ucs4Char> Ucs4String;
 
 	enum Breakable {
 		NO_BREAKABLE,
@@ -44,26 +47,30 @@
 	static int utf8Length(const std::string &str);
 	static int length(const char *str, int utf8Length);
 	static int length(const std::string &str, int utf8Length);
+	static void utf8ToUcs4(Ucs4String &to, const char *from, int length, int toLength = -1);
+	static void utf8ToUcs4(Ucs4String &to, const std::string &from, int toLength = -1);
 	static void utf8ToUcs2(Ucs2String &to, const char *from, int length, int toLength = -1);
 	static void utf8ToUcs2(Ucs2String &to, const std::string &from, int toLength = -1);
-	static int firstChar(Ucs2Char &ch, const char *utf8String);
+	static int firstChar(Ucs4Char &ch, const char *utf8String);
+	static void ucs4ToUtf8(std::string &to, const Ucs4String &from, int toLength = -1);
+	static int ucs4ToUtf8(char *to, Ucs4Char ch);
 	static void ucs2ToUtf8(std::string &to, const Ucs2String &from, int toLength = -1);
 	static int ucs2ToUtf8(char *to, Ucs2Char ch);
-	static bool isLetter(Ucs2Char ch);
-	static bool isSpace(Ucs2Char ch);
-	static bool isNBSpace(Ucs2Char ch);
-	static Breakable isBreakable(Ucs2Char ch);
+	static bool isLetter(Ucs4Char ch);
+	static bool isSpace(Ucs4Char ch);
+	static bool isNBSpace(Ucs4Char ch);
+	static Breakable isBreakable(Ucs4Char ch);
 
-	static Ucs2Char toLower(Ucs2Char ch);
-	static void toLower(Ucs2String &str);
+	static Ucs4Char toLower(Ucs4Char ch);
+	static void toLower(Ucs4String &str);
 	static std::string toLower(const std::string &utf8String);
 
-	static Ucs2Char toUpper(Ucs2Char ch);
-	static void toUpper(Ucs2String &str);
+	static Ucs4Char toUpper(Ucs4Char ch);
+	static void toUpper(Ucs4String &str);
 	static std::string toUpper(const std::string &utf8String);
 };
 
-inline bool ZLUnicodeUtil::isNBSpace(Ucs2Char ch) {
+inline bool ZLUnicodeUtil::isNBSpace(Ucs4Char ch) {
 	return ch == 160;
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLUserData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLUserData.h
--- fbreader-0.8.17/zlibrary/core/include/ZLUserData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLUserData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLUSERDATA_H__
+#define __ZLUSERDATA_H__
+
+#include <map>
+#include <string>
+
+#include <shared_ptr.h>
+
+class ZLUserData {
+
+public:
+	virtual ~ZLUserData();
+};
+
+class ZLUserDataHolder {
+
+protected:
+	virtual ~ZLUserDataHolder();
+
+public:
+	void addUserData(const std::string &key, shared_ptr<ZLUserData> data);
+	void removeUserData(const std::string &key);
+	shared_ptr<ZLUserData> getUserData(const std::string &key) const;
+
+private:
+	std::map<std::string,shared_ptr<ZLUserData> > myDataMap;
+};
+
+#endif /* __ZLUSERDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLView.h
--- fbreader-0.8.17/zlibrary/core/include/ZLView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,13 +24,26 @@
 
 #include <shared_ptr.h>
 
-#include <ZLPaintContext.h>
-
 class ZLApplication;
+class ZLViewWidget;
+class ZLPaintContext;
 
 class ZLView {
 
 public:
+	enum Angle {
+		DEGREES0 = 0,
+		DEGREES90 = 90,
+		DEGREES180 = 180,
+		DEGREES270 = 270
+	};
+
+	enum Direction {
+		VERTICAL,
+		HORIZONTAL
+	};
+
+public:
 	ZLView(ZLApplication &application, shared_ptr<ZLPaintContext> context = 0);
 	virtual ~ZLView();
 	virtual void setPaintContext(shared_ptr<ZLPaintContext> context);
@@ -54,54 +67,42 @@
 
 	bool hasContext() const;
 
-private:
-	ZLApplication &myApplication;
-	shared_ptr<ZLPaintContext> myContext;
+	void setScrollbarEnabled(Direction direction, bool enabled);
+	void setScrollbarParameters(Direction direction, size_t full, size_t from, size_t to);
+	virtual void onScrollbarMoved(Direction direction, size_t full, size_t from, size_t to);
+	virtual void onScrollbarStep(Direction direction, int steps);
+	virtual void onScrollbarPageStep(Direction direction, int steps);
 
 private:
-	ZLView(const ZLView&);
-	const ZLView &operator=(const ZLView&);
-};
-
-class ZLViewWidget {
+	struct ScrollBarInfo {
+		ScrollBarInfo();
 
-public:
-	enum Angle {
-		DEGREES0 = 0,
-		DEGREES90 = 90,
-		DEGREES180 = 180,
-		DEGREES270 = 270
+		bool Enabled;
+		bool StandardLocation;
+		size_t Full;
+		size_t From;
+		size_t To;
 	};
 
-protected:
-	ZLViewWidget(Angle initialAngle);
-
-public:
-	virtual ~ZLViewWidget();
-	void setView(shared_ptr<ZLView> view);
-	shared_ptr<ZLView> view() const;
-
-	virtual void trackStylus(bool track) = 0;
-
-	void rotate(Angle rotation);
-	Angle rotation() const;
+	void updateScrollbarState();
+	void updateScrollbarPlacement();
+	void updateScrollbarParameters();
+	void updateScrollbarParameters(Direction direction, const ScrollBarInfo &info, bool invert);
 
-protected:
-	virtual void repaint() = 0;
+private:
+	ZLApplication &myApplication;
+	ZLViewWidget *myViewWidget;
+	shared_ptr<ZLPaintContext> myContext;
+	ScrollBarInfo myVerticalScrollbarInfo;
+	ScrollBarInfo myHorizontalScrollbarInfo;
 
 private:
-	shared_ptr<ZLView> myView;
-	Angle myRotation;
+	ZLView(const ZLView&);
+	const ZLView &operator=(const ZLView&);
 
-friend class ZLApplication;
+friend class ZLViewWidget;
 };
 
-inline ZLViewWidget::ZLViewWidget(Angle initialAngle) : myView(0), myRotation(initialAngle) {}
-inline ZLViewWidget::~ZLViewWidget() {}
-inline shared_ptr<ZLView> ZLViewWidget::view() const { return myView; }
-inline void ZLViewWidget::rotate(Angle rotation) { myRotation = rotation; }
-inline ZLViewWidget::Angle ZLViewWidget::rotation() const { return myRotation; }
-
 inline bool ZLView::hasContext() const { return !myContext.isNull(); }
 inline ZLPaintContext &ZLView::context() const { return *myContext; }
 inline ZLApplication &ZLView::application() { return myApplication; }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLXMLReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLXMLReader.h
--- fbreader-0.8.17/zlibrary/core/include/ZLXMLReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLXMLReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,16 +36,22 @@
 
 protected:
 	ZLXMLReader(const char *encoding = 0);
-	virtual ~ZLXMLReader();
 	const std::map<std::string,std::string> &namespaces() const;
 
 public:
+	virtual ~ZLXMLReader();
+
 	bool readDocument(shared_ptr<ZLInputStream> stream);
 	bool readDocument(const std::string &fileName);
 
+	void initialize(const char *encoding = 0);
+	void shutdown();
+	bool readFromBuffer(const char *data, int len);
+
+protected:
 	virtual void startElementHandler(const char *tag, const char **attributes);
 	virtual void endElementHandler(const char *tag);
-	virtual void characterDataHandler(const char *text, int len);
+	virtual void characterDataHandler(const char *text, size_t len);
 	virtual bool processNamespaces() const;
 	virtual void namespaceListChangedHandler();
 	virtual const std::vector<std::string> &externalDTDs() const;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLXMLWriter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLXMLWriter.h
--- fbreader-0.8.17/zlibrary/core/include/ZLXMLWriter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLXMLWriter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/include/ZLZDecompressor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/include/ZLZDecompressor.h
--- fbreader-0.8.17/zlibrary/core/include/ZLZDecompressor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/include/ZLZDecompressor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/Makefile /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/Makefile
--- fbreader-0.8.17/zlibrary/core/Makefile	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/Makefile	2009-04-30 22:26:45.000000000 +0100
@@ -3,19 +3,25 @@
 include $(MAKEFILESDIR)/config.mk
 
 VERSION = $(shell cat ../VERSION)
-SOVERSION = $(shell cat ../SOVERSION)
+SOVERSION = $(shell cat SOVERSION)
 
 ifeq "$(ZLSHARED)" "yes"
-  TARGET = libzlcore.so.$(VERSION)
-  TARGET_SONAME = libzlcore.so.$(SOVERSION)
-  TARGET_SHORTNAME = libzlcore.so
+  ifeq "$(TARGET_ARCH)" "macosx"
+    TARGET = libzlcore.$(VERSION).dylib
+    TARGET_SONAME = libzlcore.$(SOVERSION).dylib
+    TARGET_SHORTNAME = libzlcore.dylib
+  else
+    TARGET = libzlcore.so.$(VERSION)
+    TARGET_SONAME = libzlcore.so.$(SOVERSION)
+    TARGET_SHORTNAME = libzlcore.so
+  endif
 else
   TARGET = libzlcore.a
 endif
 
-SUBDIRS_ALL = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/desktop/application src/desktop/dialogs src/posix/filesystem src/unix/time src/unix/xmlconfig src/unix/filesystem src/unix/iconv src/unix/library src/win32/encoding src/win32/filesystem src/win32/config
+SUBDIRS_ALL = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/network src/desktop/application src/desktop/dialogs src/unix/time src/unix/xmlconfig src/unix/filesystem src/unix/iconv src/unix/library src/win32/encoding src/win32/filesystem src/win32/config
 
-SUBDIRS = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/posix/filesystem src/unix/time
+SUBDIRS = src/library src/util src/filesystem src/filesystem/zip src/filesystem/bzip2 src/filesystem/tar src/dialogs src/optionEntries src/application src/view src/splittedView src/encoding src/options src/message src/resources src/time src/xml src/xml/expat src/image src/language src/unix/time src/network
 
 ifeq "<$(TARGET_ARCH)>" "$(findstring <$(TARGET_ARCH)>, <desktop> <pepperpad3>)"
   SUBDIRS += src/desktop/application src/desktop/dialogs
@@ -41,16 +47,17 @@
 	done;
 
 $(TARGET): .objects
-	@echo -n "Creating $@ ..."
+	@echo -n 'Creating $@ ...'
 	@$(RM_QUIET) $(TARGET)
 ifeq "$(ZLSHARED)" "yes"
-	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIB) $(ARCHIVER_LIB) -ldl
+	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -ldl
+	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) -lc $(patsubst %, %/*.o, $(SUBDIRS)) $(XML_LIBS) $(ARCHIVER_LIBS) $(NETWORK_LIBS) -ldl -liconv
 	@ln -sf $(TARGET) $(TARGET_SONAME)
 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
 else
 	@$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS))
 endif
-	@echo " OK"
+	@echo ' OK'
 
 SHARE_ZLIBRARY = $(DESTDIR)$(SHAREDIR)/zlibrary
 
@@ -65,7 +72,8 @@
 	@install -m 0644 $(ENCODING_FILES) $(SHARE_ZLIBRARY)/encodings
 	@install -d $(SHARE_ZLIBRARY)/resources
 	@install -m 0644 $(wildcard data/resources/*.xml) $(SHARE_ZLIBRARY)/resources
-	@install -m 0644 $(wildcard data/languagePatterns.zip) $(SHARE_ZLIBRARY)
+	@install -m 0644 data/languagePatterns.zip $(SHARE_ZLIBRARY)
+	@install -m 0644 data/unicode.xml.gz $(SHARE_ZLIBRARY)
 	@install -d $(SHARE_ZLIBRARY)/default
 	@if [ -e data/default/config.$(TARGET_ARCH).xml ]; then \
 		install -m 0644 data/default/config.$(TARGET_ARCH).xml $(SHARE_ZLIBRARY)/default/config.xml; \
@@ -97,4 +105,4 @@
 			$(MAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk clean; \
 		fi; \
 	done;
-	@$(RM) *.so *.so.* *.a
+	@$(RM) *.so *.so.* *.dylib *.a
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/SOVERSION /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/SOVERSION
--- fbreader-0.8.17/zlibrary/core/SOVERSION	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/SOVERSION	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+0.10
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLApplicationActions.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplicationActions.cpp
--- fbreader-0.8.17/zlibrary/core/src/application/ZLApplicationActions.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplicationActions.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,49 +19,46 @@
 
 #include "ZLApplication.h"
 #include "../view/ZLView.h"
+#include "../view/ZLViewWidget.h"
 
 ZLApplication::RotationAction::RotationAction(ZLApplication &application) : myApplication(application) {
 }
 
-bool ZLApplication::RotationAction::isVisible() {
+bool ZLApplication::RotationAction::isVisible() const {
 	return (myApplication.myViewWidget != 0) &&
-				 ((myApplication.RotationAngleOption.value() != ZLViewWidget::DEGREES0) ||
-					(myApplication.myViewWidget->rotation() != ZLViewWidget::DEGREES0));
+				 ((myApplication.RotationAngleOption.value() != ZLView::DEGREES0) ||
+					(myApplication.myViewWidget->rotation() != ZLView::DEGREES0));
 }
 
 void ZLApplication::RotationAction::run() {
 	int optionValue = myApplication.RotationAngleOption.value();
-	ZLViewWidget::Angle oldAngle = myApplication.myViewWidget->rotation();
-	ZLViewWidget::Angle newAngle = ZLViewWidget::DEGREES0;
+	ZLView::Angle oldAngle = myApplication.myViewWidget->rotation();
+	ZLView::Angle newAngle = ZLView::DEGREES0;
 	if (optionValue == -1) {
 		switch (oldAngle) {
-			case ZLViewWidget::DEGREES0:
-				newAngle = ZLViewWidget::DEGREES90;
+			case ZLView::DEGREES0:
+				newAngle = ZLView::DEGREES90;
 				break;
-			case ZLViewWidget::DEGREES90:
-				newAngle = ZLViewWidget::DEGREES180;
+			case ZLView::DEGREES90:
+				newAngle = ZLView::DEGREES180;
 				break;
-			case ZLViewWidget::DEGREES180:
-				newAngle = ZLViewWidget::DEGREES270;
+			case ZLView::DEGREES180:
+				newAngle = ZLView::DEGREES270;
 				break;
-			case ZLViewWidget::DEGREES270:
-				newAngle = ZLViewWidget::DEGREES0;
+			case ZLView::DEGREES270:
+				newAngle = ZLView::DEGREES0;
 				break;
 		}
 	} else {
-		newAngle = (oldAngle == ZLViewWidget::DEGREES0) ?
-			(ZLViewWidget::Angle)optionValue : ZLViewWidget::DEGREES0;
+		newAngle = (oldAngle == ZLView::DEGREES0) ?
+			(ZLView::Angle)optionValue : ZLView::DEGREES0;
 	}
 	myApplication.myViewWidget->rotate(newAngle);
 	myApplication.AngleStateOption.setValue(newAngle);
 	myApplication.refreshWindow();
 }
 
-ZLApplication::FullscreenAction::FullscreenAction(ZLApplication &application, bool toggle) : myApplication(application), myIsToggle(toggle) {
-}
-
-bool ZLApplication::FullscreenAction::isVisible() {
-	return myIsToggle || !myApplication.isFullscreen();
+ZLApplication::FullscreenAction::FullscreenAction(ZLApplication &application) : myApplication(application) {
 }
 
 void ZLApplication::FullscreenAction::run() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLApplicationBase.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplicationBase.cpp
--- fbreader-0.8.17/zlibrary/core/src/application/ZLApplicationBase.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplicationBase.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLApplication.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplication.cpp
--- fbreader-0.8.17/zlibrary/core/src/application/ZLApplication.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplication.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,11 @@
 #include "ZLApplication.h"
 #include "ZLApplicationWindow.h"
 #include "ZLKeyBindings.h"
+#include "ZLToolbar.h"
+#include "ZLMenu.h"
+#include "ZLPopupData.h"
 #include "../view/ZLView.h"
+#include "../view/ZLViewWidget.h"
 #include "../view/ZLPaintContext.h"
 
 const std::string ZLApplication::MouseScrollDownKey = "<MouseScrollDown>";
@@ -38,18 +42,15 @@
 static const std::string AUTO_SAVE = "AutoSave";
 static const std::string TIMEOUT = "Timeout";
 
-bool ZLApplication::myIsViewFinal = true;
-
 ZLApplication::ZLApplication(const std::string &name) : ZLApplicationBase(name),
-	RotationAngleOption(ZLCategoryKey::CONFIG, ROTATION, ANGLE, ZLViewWidget::DEGREES90),
-	AngleStateOption(ZLCategoryKey::CONFIG, STATE, ANGLE, ZLViewWidget::DEGREES0),
+	RotationAngleOption(ZLCategoryKey::CONFIG, ROTATION, ANGLE, ZLView::DEGREES90),
+	AngleStateOption(ZLCategoryKey::CONFIG, STATE, ANGLE, ZLView::DEGREES0),
 	KeyboardControlOption(ZLCategoryKey::CONFIG, KEYBOARD, FULL_CONTROL, false),
 	ConfigAutoSavingOption(ZLCategoryKey::CONFIG, CONFIG, AUTO_SAVE, true),
 	ConfigAutoSaveTimeoutOption(ZLCategoryKey::CONFIG, CONFIG, TIMEOUT, 1, 6000, 30),
 	KeyDelayOption(ZLCategoryKey::CONFIG, "Options", "KeyDelay", 0, 5000, 250),
 	myViewWidget(0),
 	myWindow(0) {
-	myIsViewFinal = true;
 	myContext = ZLibrary::createContext();
 	if (ConfigAutoSavingOption.value()) {
 		ZLOption::startAutoSave(ConfigAutoSaveTimeoutOption.value());
@@ -58,7 +59,8 @@
 	myPresentWindowHandler = new PresentWindowHandler(*this);
 	ZLCommunicationManager::instance().registerHandler("present", myPresentWindowHandler);
 
-	createToolbar();
+	createToolbar(ZLApplicationWindow::WINDOW_TOOLBAR);
+	createToolbar(ZLApplicationWindow::FULLSCREEN_TOOLBAR);
 	createMenubar();
 }
 
@@ -97,12 +99,16 @@
 void ZLApplicationWindow::init() {
 	myApplication->myViewWidget = createViewWidget();
 
-	const ZLApplication::Toolbar::ItemVector &toolbarItems = myApplication->toolbar().items();
-	for (ZLApplication::Toolbar::ItemVector::const_iterator it = toolbarItems.begin(); it != toolbarItems.end(); ++it) {
+	initToolbar(WINDOW_TOOLBAR);
+	initToolbar(FULLSCREEN_TOOLBAR);
+	initMenu();
+}
+
+void ZLApplicationWindow::initToolbar(ToolbarType type) {
+	const ZLToolbar::ItemVector &toolbarItems = myApplication->toolbar(type).items();
+	for (ZLToolbar::ItemVector::const_iterator it = toolbarItems.begin(); it != toolbarItems.end(); ++it) {
 		addToolbarItem(*it);
 	}
-
-	initMenu();
 }
 
 void ZLApplication::addAction(const std::string &actionId, shared_ptr<Action> action) {
@@ -183,11 +189,11 @@
 ZLApplication::Action::~Action() {
 }
 
-bool ZLApplication::Action::isVisible() {
+bool ZLApplication::Action::isVisible() const {
 	return true;
 }
 
-bool ZLApplication::Action::isEnabled() {
+bool ZLApplication::Action::isEnabled() const {
 	return isVisible();
 }
 
@@ -202,14 +208,28 @@
 }
 
 void ZLApplicationWindow::refresh() {
-	const ZLApplication::Toolbar::ItemVector &items = application().toolbar().items();
+	refreshToolbar(WINDOW_TOOLBAR);
+	refreshToolbar(FULLSCREEN_TOOLBAR);
+	processAllEvents();
+}
+
+void ZLApplicationWindow::refreshToolbar(ToolbarType type) {
+	const ZLToolbar::ItemVector &items = application().toolbar(type).items();
 	bool enableToolbarSpace = false;
-	ZLApplication::Toolbar::ItemPtr lastSeparator = 0;
-	for (ZLApplication::Toolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
+	ZLToolbar::ItemPtr lastSeparator = 0;
+	for (ZLToolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
 		switch ((*it)->type()) {
-			case ZLApplication::Toolbar::Item::OPTION_ENTRY:
+			case ZLToolbar::Item::TEXT_FIELD:
+			case ZLToolbar::Item::COMBO_BOX:
+			case ZLToolbar::Item::PLAIN_BUTTON:
+			case ZLToolbar::Item::MENU_BUTTON:
 				{
-					bool visible = ((const ZLApplication::Toolbar::OptionEntryItem&)**it).entry()->isVisible();
+					ZLToolbar::ActionItem &button = (ZLToolbar::ActionItem&)**it;
+					const std::string &id = button.actionId();
+        
+					const bool visible = application().isActionVisible(id);
+					const bool enabled = application().isActionEnabled(id);
+        
 					if (visible) {
 						if (!lastSeparator.isNull()) {
 							setToolbarItemState(lastSeparator, true, true);
@@ -217,12 +237,12 @@
 						}
 						enableToolbarSpace = true;
 					}
-					setToolbarItemState(*it, visible, true);
+					setToolbarItemState(*it, visible, enabled);
 				}
 				break;
-			case ZLApplication::Toolbar::Item::BUTTON:
+			case ZLToolbar::Item::TOGGLE_BUTTON:
 				{
-					const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it;
+					ZLToolbar::ToggleButtonItem &button = (ZLToolbar::ToggleButtonItem&)**it;
 					const std::string &id = button.actionId();
         
 					const bool visible = application().isActionVisible(id);
@@ -235,18 +255,20 @@
 						}
 						enableToolbarSpace = true;
 					}
+					/*
 					if (!enabled && button.isPressed()) {
-						shared_ptr<ZLApplication::Toolbar::ButtonGroup> group = button.buttonGroup();
-						group->press(0);
-						application().doAction(group->UnselectAllButtonsActionId);
+						button.buttonGroup().press(0);
+						//application().doAction(group->UnselectAllButtonsActionId);
 						myToggleButtonLock = true;
 						setToggleButtonState(button);
 						myToggleButtonLock = false;
 					}
+					*/
 					setToolbarItemState(*it, visible, enabled);
+					setToggleButtonState(button);
 				}
 				break;
-			case ZLApplication::Toolbar::Item::SEPARATOR:
+			case ZLToolbar::Item::SEPARATOR:
 				if (enableToolbarSpace) {
 					lastSeparator = *it;
 					enableToolbarSpace = false;
@@ -262,7 +284,11 @@
 }
 
 void ZLApplication::doActionByKey(const std::string &key) {
-	shared_ptr<Action> a = action(keyBindings().getBinding(key));
+	shared_ptr<ZLKeyBindings> bindings = keyBindings();
+	if (bindings.isNull()) {
+		return;
+	}
+	shared_ptr<Action> a = action(bindings->getBinding(key));
 	if (!a.isNull() &&
 			(!a->useKeyDelay() ||
 			 (myLastKeyActionTime.millisecondsTo(ZLTime()) >= KeyDelayOption.value()))) {
@@ -329,21 +355,31 @@
 	return myContext;
 }
 
-void ZLApplicationWindow::onButtonPress(ZLApplication::Toolbar::ButtonItem &button) {
+ZLApplicationWindow::ToolbarType ZLApplicationWindow::type(const ZLToolbar::Item &item) const {
+	return
+		(&item.toolbar() == &application().toolbar(WINDOW_TOOLBAR)) ?
+			WINDOW_TOOLBAR : FULLSCREEN_TOOLBAR;
+}
+
+bool ZLApplicationWindow::hasFullscreenToolbar() const {
+	return !application().toolbar(FULLSCREEN_TOOLBAR).items().empty();
+}
+
+void ZLApplicationWindow::onButtonPress(const ZLToolbar::AbstractButtonItem &button) {
 	if (myToggleButtonLock) {
 		return;
 	}
-	if (button.isToggleButton()) {
+	if (button.type() == ZLToolbar::Item::TOGGLE_BUTTON) {
+		ZLToolbar::ToggleButtonItem &toggleButton = (ZLToolbar::ToggleButtonItem&)button;
 		myToggleButtonLock = true;
-		if (button.isPressed()) {
-			setToggleButtonState(button);
+		if (toggleButton.isPressed()) {
+			setToggleButtonState(toggleButton);
 			myToggleButtonLock = false;
 			return;
 		} else {
-			button.press();
-			shared_ptr<ZLApplication::Toolbar::ButtonGroup> group = button.buttonGroup();
-			const std::set<const ZLApplication::Toolbar::ButtonItem*> &items = group->Items;
-			for (std::set<const ZLApplication::Toolbar::ButtonItem*>::const_iterator it = items.begin(); it != items.end(); ++it) {
+			toggleButton.press();
+			const ZLToolbar::ButtonGroup::ItemSet &items = toggleButton.buttonGroup().myItems;
+			for (ZLToolbar::ButtonGroup::ItemSet::const_iterator it = items.begin(); it != items.end(); ++it) {
 				setToggleButtonState(**it);
 			}
 		}
@@ -353,9 +389,81 @@
 }
 
 bool ZLApplication::isViewFinal() const {
-	return myIsViewFinal;
+	return true;
+}
+
+void ZLApplication::setVisualParameter(const std::string &id, const std::string &value) {
+	if (myWindow != 0) {
+		myWindow->setVisualParameter(id, value);
+	}
+}
+
+void ZLApplication::setParameterValueList(const std::string &id, const std::vector<std::string> &values) {
+	if (myWindow != 0) {
+		myWindow->setParameterValueList(id, values);
+	}
+}
+
+const std::string &ZLApplication::visualParameter(const std::string &id) {
+	if (myWindow != 0) {
+		return myWindow->visualParameter(id);
+	}
+	static const std::string EMPTY;
+	return EMPTY;
+}
+
+void ZLApplicationWindow::setVisualParameter(const std::string &id, const std::string &value) {
+	std::map<std::string,shared_ptr<VisualParameter> >::iterator it = myParameterMap.find(id);
+	if (it != myParameterMap.end()) {
+		it->second->setValue(value);
+	}
+}
+
+void ZLApplicationWindow::setParameterValueList(const std::string &id, const std::vector<std::string> &values) {
+	std::map<std::string,shared_ptr<VisualParameter> >::iterator it = myParameterMap.find(id);
+	if (it != myParameterMap.end()) {
+		it->second->setValueList(values);
+	}
+}
+
+const std::string &ZLApplicationWindow::visualParameter(const std::string &id) {
+	std::map<std::string,shared_ptr<VisualParameter> >::const_iterator it = myParameterMap.find(id);
+	if (it != myParameterMap.end()) {
+		return it->second->value();
+	}
+	static const std::string EMPTY;
+	return EMPTY;
+}
+
+void ZLApplicationWindow::addVisualParameter(const std::string &id, shared_ptr<VisualParameter> parameter) {
+	if (!parameter.isNull()) {
+		myParameterMap[id] = parameter;
+	}
+}
+
+ZLApplicationWindow::VisualParameter::~VisualParameter() {
+}
+
+const std::string &ZLApplicationWindow::VisualParameter::value() const {
+	myValue = internalValue();
+	return myValue;
+}
+
+void ZLApplicationWindow::VisualParameter::setValue(const std::string &value) {
+	if (value != myValue) {
+		myValue = value;
+		internalSetValue(value);
+	}
+}
+
+void ZLApplicationWindow::VisualParameter::restoreOldValue() {
+	internalSetValue(myValue);
+}
+
+ZLView::Angle ZLApplication::rotation() const {
+	return (myViewWidget != 0) ? myViewWidget->rotation() : ZLView::DEGREES0;
 }
 
-void ZLApplication::setViewFinal(bool final) {
-	myIsViewFinal = final;
+shared_ptr<ZLKeyBindings> ZLApplication::keyBindings() {
+	return 0;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLApplication.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplication.h
--- fbreader-0.8.17/zlibrary/core/src/application/ZLApplication.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplication.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,24 +27,23 @@
 
 #include <shared_ptr.h>
 #include <ZLOptions.h>
-#include <ZLOptionEntry.h>
 #include <ZLTime.h>
 #include <ZLResource.h>
 #include <ZLMessage.h>
+#include <ZLView.h>
 
-class ZLView;
 class ZLViewWidget;
 class ZLPaintContext;
 class ZLKeyBindings;
+class ZLToolbar;
+class ZLPopupData;
+class ZLMenubar;
 
 class ZLApplicationBase {
 
 protected:
 	ZLApplicationBase(const std::string &name);
 	~ZLApplicationBase();
-
-private:
-	std::string replaceRegExps(const std::string &pattern);
 };
 
 class ZLApplication : public ZLApplicationBase {
@@ -71,8 +70,8 @@
 
 	public:
 		virtual ~Action();
-		virtual bool isVisible();
-		virtual bool isEnabled();
+		virtual bool isVisible() const;
+		virtual bool isEnabled() const;
 		void checkAndRun();
 		virtual bool useKeyDelay() const;
 
@@ -85,7 +84,7 @@
 
 	public:
 		RotationAction(ZLApplication &application);
-		bool isVisible();
+		bool isVisible() const;
 		void run();
 
 	private:
@@ -93,221 +92,18 @@
 	};
 	friend class RotationAction;
 	
+public:
 	class FullscreenAction : public Action {
 
 	public:
-		FullscreenAction(ZLApplication &application, bool toggle);
-		bool isVisible();
+		FullscreenAction(ZLApplication &application);
 		void run();
 
 	private:
 		ZLApplication &myApplication;
-		bool myIsToggle;
 	};
 	friend class FullscreenAction;
 	
-public:
-
-	class Toolbar {
-
-	public:
-		class Item {
-
-		public:
-			enum Type {
-				BUTTON,
-				OPTION_ENTRY,
-				SEPARATOR
-			};
-
-		public:
-			Item();
-			virtual ~Item();
-
-			virtual Type type() const = 0;
-
-		friend class Toolbar;
-		};
-	
-		class ButtonGroup;
-
-		class ButtonItem : public Item {
-
-		public:
-			ButtonItem(const std::string &actionId, const ZLResource &tooltip);
-
-			Type type() const;
-
-			const std::string &actionId() const;
-			const std::string &iconName() const;
-			const std::string &tooltip() const;
-
-			shared_ptr<ButtonGroup> buttonGroup() const;
-			bool isToggleButton() const;
-			void press();
-			bool isPressed() const;
-
-		private:
-			void setButtonGroup(shared_ptr<ButtonGroup>);
-
-		private:
-			const std::string myActionId;
-			const ZLResource &myTooltip;
-			shared_ptr<ButtonGroup> myButtonGroup;
-
-		friend class Toolbar;
-		};
-	
-		struct ButtonGroup {
-
-		private:
-			ButtonGroup(const std::string &unselectAllButtonsActionId);
-			void press(const ButtonItem *item);
-
-		private:
-			const std::string UnselectAllButtonsActionId;
-			std::set<const ButtonItem*> Items;
-			const ButtonItem *PressedItem;
-
-		friend class ButtonItem;
-		friend class Toolbar;
-		friend class ZLApplicationWindow;
-		};
-
-		class SeparatorItem : public Item {
-
-		public:
-			Type type() const;
-		};
-
-		class OptionEntryItem : public Item {
-
-		public:
-			OptionEntryItem(shared_ptr<ZLOptionEntry> entry);
-			Type type() const;
-			shared_ptr<ZLOptionEntry> entry() const;
-
-		private:
-			shared_ptr<ZLOptionEntry> myOptionEntry;
-		};
-
-	public:
-		typedef shared_ptr<Item> ItemPtr;
-		typedef std::vector<ItemPtr> ItemVector;
-
-		Toolbar();
-		void addButton(const std::string &actionId, shared_ptr<ButtonGroup> group = 0);
-		shared_ptr<ButtonGroup> createButtonGroup(const std::string &unselectAllButtonsActionId);
-		void addOptionEntry(shared_ptr<ZLOptionEntry> entry);
-		void addSeparator();
-
-		const ItemVector &items() const;
-
-	private:
-		ItemVector myItems;
-		const ZLResource &myResource;
-
-	friend class ZLApplication;
-	};
-
-	class Menu {
-
-	public:
-		class Item {
-
-		public:
-			enum ItemType {
-				ITEM,
-				SUBMENU,
-				SEPARATOR
-			};
-			
-		public:
-			virtual ~Item();
-			ItemType type() const;
-
-		protected:
-			Item(ItemType type);
-
-		private:
-			const ItemType myType;
-		};
-
-		typedef shared_ptr<Item> ItemPtr;
-		typedef std::vector<ItemPtr> ItemVector;
-
-		void addItem(const std::string &actionId, const ZLResourceKey &key);
-		void addSeparator();
-		ItemPtr addSubmenu(const ZLResourceKey &key);
-
-		const ItemVector &items() const;
-
-		virtual ~Menu();
-
-	protected:
-		Menu(const ZLResource &resource);
-
-	protected:
-		const ZLResource &myResource;
-
-	private:
-		ItemVector myItems;
-
-	friend class ZLApplication;
-	};
-
-	class Menubar : public Menu {
-
-	public:
-		class PlainItem : public Menu::Item {
-
-		public:
-			PlainItem(const std::string &name, const std::string &actionId);
-
-			const std::string &name() const;
-			const std::string &actionId() const;
-
-		private:
-			const std::string myName;
-			const std::string myActionId;
-		};
-
-		class Submenu : public Menu::Item, public Menu {
-
-		public:
-			Submenu(const ZLResource &resource);
-
-			const std::string &menuName() const;
-		};
-
-		class Separator : public Menu::Item {
-
-		public:
-			Separator();
-		};
-
-	public:
-		Menubar();
-
-	friend class ZLApplication;
-	};
-
-	class MenuVisitor {
-
-	public:
-		virtual ~MenuVisitor();
-		void processMenu(ZLApplication &application);
-
-	private:
-		void processMenu(ZLApplication::Menu &menu);
-
-	protected:
-		virtual void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu) = 0;
-		virtual void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu) = 0;
-		virtual void processItem(ZLApplication::Menubar::PlainItem &item) = 0;
-		virtual void processSepartor(ZLApplication::Menubar::Separator &separator) = 0;
-	};
-
 	class PresentWindowHandler : public ZLMessageHandler {
 
 	public:
@@ -325,13 +121,14 @@
 	ZLApplication(const std::string &name);
 
 	void addAction(const std::string &actionId, shared_ptr<Action> action);
+	void registerPopupData(const std::string &actionId, shared_ptr<ZLPopupData> popupData);
 
 	void setView(shared_ptr<ZLView> view);
 	shared_ptr<ZLView> currentView() const;
+	ZLView::Angle rotation() const;
 
 	void setFullscreen(bool fullscreen);
 	bool isFullscreen() const;
-	void resetWindowCaption();
 	void quit();
 
 public:
@@ -343,6 +140,7 @@
 	void grabAllKeys(bool grab);
 	void trackStylus(bool track);
 
+	void resetWindowCaption();
 	void setHyperlinkCursor(bool hyperlink);
 
 	shared_ptr<Action> action(const std::string &actionId) const;
@@ -350,16 +148,13 @@
 	bool isActionEnabled(const std::string &actionId) const;
 	void doAction(const std::string &actionId);
 
-	virtual ZLKeyBindings &keyBindings() = 0;	
+	virtual shared_ptr<ZLKeyBindings> keyBindings();	
 	void doActionByKey(const std::string &key);
 
 	virtual bool closeView();
 	virtual void openFile(const std::string &fileName);
 
-	// TODO in 1.0: replace by virtual method
-	bool isViewFinal() const;
-	// TODO in 1.0: remove
-	void setViewFinal(bool final);
+	virtual bool isViewFinal() const;
 
 	void refreshWindow();
 	void presentWindow();
@@ -367,33 +162,35 @@
 	const std::string &lastCaller() const;
 	void resetLastCaller();
 
+	void setVisualParameter(const std::string &id, const std::string &value);
+	void setParameterValueList(const std::string &id, const std::vector<std::string> &values);
+	const std::string &visualParameter(const std::string &id);
+
 private:
-	void createToolbar();
+	void createToolbar(int index);
+
+// TODO: change access rights to private
 public:
-	// TODO: change to private
-	const Toolbar &toolbar() const;
+	const ZLToolbar &toolbar(int index) const;
 
 private:
 	void createMenubar();
-	const Menubar &menubar() const;
-
-protected:
-	ZLViewWidget *myViewWidget;
+	const ZLMenubar &menubar() const;
 
 private:
+	ZLViewWidget *myViewWidget;
 	shared_ptr<ZLView> myInitialView;
 	std::map<std::string,shared_ptr<Action> > myActionMap;
-	Toolbar myToolbar;
-	Menubar myMenubar;
+	mutable shared_ptr<ZLToolbar> myToolbar;
+	mutable shared_ptr<ZLToolbar> myFullscreenToolbar;
+	mutable shared_ptr<ZLMenubar> myMenubar;
 	shared_ptr<ZLPaintContext> myContext;
 	class ZLApplicationWindow *myWindow;
 	ZLTime myLastKeyActionTime;
 	shared_ptr<ZLMessageHandler> myPresentWindowHandler;
-	// TODO in 1.0: change to non-static
-	static bool myIsViewFinal;
 
 friend class ZLApplicationWindow;
-friend class MenuVisitor;
+friend class ZLMenuVisitor;
 };
 
 #endif /* __ZLAPPLICATION_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplicationWindow.h
--- fbreader-0.8.17/zlibrary/core/src/application/ZLApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,8 @@
 
 #include <string>
 
-#include <ZLApplication.h>
+#include "ZLApplication.h"
+#include "ZLToolbar.h"
 
 class ZLApplicationWindow {
 
@@ -30,24 +31,43 @@
 	ZLApplicationWindow(ZLApplication *application);
 
 public:
+	virtual ~ZLApplicationWindow();
+
+public:
 	ZLApplication &application() const;
 
 protected:
+	virtual ZLViewWidget *createViewWidget() = 0;
+
 	virtual void init();
-	// TODO: change to pure virtual
-	virtual void initMenu() {}
 
-	void onButtonPress(ZLApplication::Toolbar::ButtonItem &button);
-	// TODO: change to pure virtual
-	virtual void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem&) {}
+	enum ToolbarType {
+		WINDOW_TOOLBAR,
+		FULLSCREEN_TOOLBAR
+	};
+
+private:
+	void initToolbar(ToolbarType type);
+
+protected:
 	// TODO: change to pure virtual
-	virtual void setToolbarItemState(ZLApplication::Toolbar::ItemPtr /*item*/, bool /*visible*/, bool /*enabled*/) {}
+	virtual void initMenu() {};
 
-	virtual ZLViewWidget *createViewWidget() = 0;
-	virtual void addToolbarItem(ZLApplication::Toolbar::ItemPtr item) = 0;
+	ToolbarType type(const ZLToolbar::Item &item) const;
+	bool hasFullscreenToolbar() const;
+	void onButtonPress(const ZLToolbar::AbstractButtonItem &button);
+	virtual void addToolbarItem(ZLToolbar::ItemPtr item) = 0;
+	// TODO: change to pure virtual
+	virtual void setToolbarItemState(ZLToolbar::ItemPtr /*item*/, bool /*visible*/, bool /*enabled*/) {};
+	virtual void setToggleButtonState(const ZLToolbar::ToggleButtonItem &toggleButton) = 0;
 
-	// TODO: change to non-virtual (?)
 	virtual void refresh();
+	virtual void processAllEvents() = 0;
+
+private:
+	void refreshToolbar(ToolbarType type);
+
+protected:
 	// TODO: change to pure virtual
 	virtual void present() {}
 
@@ -63,12 +83,36 @@
 	// TODO: change to pure virtual (?)
 	virtual void setHyperlinkCursor(bool) {}
 
-public:
-	virtual ~ZLApplicationWindow();
+	void setVisualParameter(const std::string &id, const std::string &value);
+	void setParameterValueList(const std::string &id, const std::vector<std::string> &values);
+	const std::string &visualParameter(const std::string &id);
+
+protected:
+	class VisualParameter {
+
+	public:
+		virtual ~VisualParameter();
+
+		const std::string &value() const;
+		void setValue(const std::string &value);
+		virtual void setValueList(const std::vector<std::string> &values) = 0;
+
+	protected:
+		virtual std::string internalValue() const = 0;
+		virtual void internalSetValue(const std::string &value) = 0;
+		void restoreOldValue();
+
+	private:
+		mutable std::string myValue;
+	};
+
+protected:
+	void addVisualParameter(const std::string &id, shared_ptr<VisualParameter> parameter);
 
 private:
 	ZLApplication *myApplication;
 	bool myToggleButtonLock;
+	std::map<std::string,shared_ptr<VisualParameter> > myParameterMap;
 
 friend class ZLApplication;
 };
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLKeyBindings.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLKeyBindings.cpp
--- fbreader-0.8.17/zlibrary/core/src/application/ZLKeyBindings.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLKeyBindings.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLKeyBindings.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLKeyBindings.h
--- fbreader-0.8.17/zlibrary/core/src/application/ZLKeyBindings.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLKeyBindings.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLMenu.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLMenu.cpp
--- fbreader-0.8.17/zlibrary/core/src/application/ZLMenu.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLMenu.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,32 +22,34 @@
 #include <ZLibrary.h>
 
 #include "ZLApplication.h"
+#include "ZLMenu.h"
 
 class ZLMenubarCreator : public ZLXMLReader {
 
 public:
-	ZLMenubarCreator(ZLApplication::Menubar &menubar);
+	ZLMenubarCreator(ZLMenubar &menubar);
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
 
 private:
-	ZLApplication::Menu &myMenubar;
-	std::vector<ZLApplication::Menu::ItemPtr> mySubmenuStack;
+	ZLMenu &myMenubar;
+	std::vector<ZLMenu::ItemPtr> mySubmenuStack;
 };
 
 void ZLApplication::createMenubar() {
-	ZLMenubarCreator(myMenubar).readDocument(ZLibrary::DefaultFilesPathPrefix() + "menubar.xml");
+	menubar();
+	ZLMenubarCreator(*myMenubar).readDocument(ZLibrary::DefaultFilesPathPrefix() + "menubar.xml");
 }
 
-ZLMenubarCreator::ZLMenubarCreator(ZLApplication::Menubar &menubar) : myMenubar(menubar) {
+ZLMenubarCreator::ZLMenubarCreator(ZLMenubar &menubar) : myMenubar(menubar) {
 }
 
 static const std::string ITEM = "item";
 static const std::string SUBMENU = "submenu";
 
 void ZLMenubarCreator::startElementHandler(const char *tag, const char **attributes) {
-	ZLApplication::Menu &menu =
-		mySubmenuStack.empty() ?  myMenubar : (ZLApplication::Menubar::Submenu&)*mySubmenuStack.back();
+	ZLMenu &menu =
+		mySubmenuStack.empty() ?  myMenubar : (ZLMenubar::Submenu&)*mySubmenuStack.back();
 	if (ITEM == tag) {
 		const char *id = attributeValue(attributes, "id");
 		if (id != 0) {
@@ -70,94 +72,99 @@
 	}
 }
 
-ZLApplication::Menu::Menu(const ZLResource &resource) : myResource(resource) {
+ZLMenu::ZLMenu(const ZLResource &resource) : myResource(resource) {
 }
 
-ZLApplication::Menu::~Menu() {
+ZLMenu::~ZLMenu() {
 }
 
-const ZLApplication::Menu::ItemVector &ZLApplication::Menu::items() const {
+const ZLMenu::ItemVector &ZLMenu::items() const {
 	return myItems;
 }
 
-ZLApplication::Menu::Item::Item(ItemType type): myType(type) {
+ZLMenu::Item::Item(ItemType type): myType(type) {
 }
 
-ZLApplication::Menu::Item::~Item() {
+ZLMenu::Item::~Item() {
 }
 
-ZLApplication::Menu::Item::ItemType ZLApplication::Menubar::Item::type() const {
+ZLMenu::Item::ItemType ZLMenubar::Item::type() const {
 	return myType;
 }
 
-void ZLApplication::Menu::addItem(const std::string &actionId, const ZLResourceKey &key) {
-	myItems.push_back(new Menubar::PlainItem(myResource[key].value(), actionId));
+void ZLMenu::addItem(const std::string &actionId, const ZLResourceKey &key) {
+	myItems.push_back(new ZLMenubar::PlainItem(myResource[key].value(), actionId));
 }
 
-void ZLApplication::Menu::addSeparator() {
-	myItems.push_back(new Menubar::Separator());
+void ZLMenu::addSeparator() {
+	myItems.push_back(new ZLMenubar::Separator());
 }
 
-ZLApplication::Menu::ItemPtr ZLApplication::Menu::addSubmenu(const ZLResourceKey &key) {
-	ItemPtr submenu = new Menubar::Submenu(myResource[key]);
+ZLMenu::ItemPtr ZLMenu::addSubmenu(const ZLResourceKey &key) {
+	ItemPtr submenu = new ZLMenubar::Submenu(myResource[key]);
 	myItems.push_back(submenu);
 	return submenu;
 }
 
 
-ZLApplication::Menubar::Menubar() : Menu(ZLResource::resource("menu")) {
+ZLMenubar::ZLMenubar() : ZLMenu(ZLResource::resource("menu")) {
 }
 
-ZLApplication::Menubar::PlainItem::PlainItem(const std::string& name, const std::string &actionId) : Item(ITEM), myName(name), myActionId(actionId) {
+ZLMenubar::PlainItem::PlainItem(const std::string& name, const std::string &actionId) : Item(ITEM), myName(name), myActionId(actionId) {
 }
 
-const std::string& ZLApplication::Menubar::PlainItem::name() const {
+const std::string& ZLMenubar::PlainItem::name() const {
 	return myName;
 }
 
-const std::string &ZLApplication::Menubar::PlainItem::actionId() const {
+const std::string &ZLMenubar::PlainItem::actionId() const {
 	return myActionId;
 }
 
-ZLApplication::Menubar::Submenu::Submenu(const ZLResource &resource) : Menu::Item(SUBMENU), Menu(resource) {
+ZLMenubar::Submenu::Submenu(const ZLResource &resource) : ZLMenu::Item(SUBMENU), ZLMenu(resource) {
 }
 
-const std::string &ZLApplication::Menubar::Submenu::menuName() const {
+const std::string &ZLMenubar::Submenu::menuName() const {
 	return myResource.value();
 }
 
-ZLApplication::Menubar::Separator::Separator() : Item(SEPARATOR) {
+ZLMenubar::Separator::Separator() : Item(SEPARATOR) {
 }
 
-ZLApplication::MenuVisitor::~MenuVisitor() {
+ZLMenuVisitor::~ZLMenuVisitor() {
 }
 
-void ZLApplication::MenuVisitor::processMenu(ZLApplication &application) {
-	processMenu(application.myMenubar);
+void ZLMenuVisitor::processMenu(ZLApplication &application) {
+	if (!application.myMenubar.isNull()) {
+		processMenu(*application.myMenubar);
+	}
 }
 
-void ZLApplication::MenuVisitor::processMenu(ZLApplication::Menu &menu) {
-	const ZLApplication::Menu::ItemVector &items = menu.items();
-	for (ZLApplication::Menu::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
+void ZLMenuVisitor::processMenu(ZLMenu &menu) {
+	const ZLMenu::ItemVector &items = menu.items();
+	for (ZLMenu::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
 		switch ((*it)->type()) {
-			case ZLApplication::Menu::Item::ITEM:
-				processItem((ZLApplication::Menubar::PlainItem&)**it);
+			case ZLMenu::Item::ITEM:
+				processItem((ZLMenubar::PlainItem&)**it);
 				break;
-			case ZLApplication::Menu::Item::SUBMENU:
+			case ZLMenu::Item::SUBMENU:
 			{
-				ZLApplication::Menubar::Submenu &submenu = (ZLApplication::Menubar::Submenu&)**it;
+				ZLMenubar::Submenu &submenu = (ZLMenubar::Submenu&)**it;
 				processSubmenuBeforeItems(submenu);
 				processMenu(submenu);
 				processSubmenuAfterItems(submenu);
 				break;
 			}
-			case ZLApplication::Menu::Item::SEPARATOR:
-				processSepartor((ZLApplication::Menubar::Separator&)**it);
+			case ZLMenu::Item::SEPARATOR:
+				processSepartor((ZLMenubar::Separator&)**it);
 				break;
 		}							
 	}
 }
 
-const ZLApplication::Menubar &ZLApplication::menubar() const {
-	return myMenubar;
+const ZLMenubar &ZLApplication::menubar() const {
+	if (myMenubar.isNull()) {
+		myMenubar = new ZLMenubar();
+	}
+	return *myMenubar;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLMenu.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLMenu.h
--- fbreader-0.8.17/zlibrary/core/src/application/ZLMenu.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLMenu.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLMENU_H__
+#define __ZLMENU_H__
+
+#include <string>
+#include <vector>
+
+#include <shared_ptr.h>
+#include <ZLResource.h>
+
+class ZLMenu {
+
+public:
+	class Item {
+
+	public:
+		enum ItemType {
+			ITEM,
+			SUBMENU,
+			SEPARATOR
+		};
+		
+	public:
+		virtual ~Item();
+		ItemType type() const;
+
+	protected:
+		Item(ItemType type);
+
+	private:
+		const ItemType myType;
+	};
+
+	typedef shared_ptr<Item> ItemPtr;
+	typedef std::vector<ItemPtr> ItemVector;
+
+	void addItem(const std::string &actionId, const ZLResourceKey &key);
+	void addSeparator();
+	ItemPtr addSubmenu(const ZLResourceKey &key);
+
+	const ItemVector &items() const;
+
+	virtual ~ZLMenu();
+
+protected:
+	ZLMenu(const ZLResource &resource);
+
+protected:
+	const ZLResource &myResource;
+
+private:
+	ItemVector myItems;
+
+friend class ZLApplication;
+};
+
+class ZLMenubar : public ZLMenu {
+
+public:
+	class PlainItem : public ZLMenu::Item {
+
+	public:
+		PlainItem(const std::string &name, const std::string &actionId);
+
+		const std::string &name() const;
+		const std::string &actionId() const;
+
+	private:
+		const std::string myName;
+		const std::string myActionId;
+	};
+
+	class Submenu : public ZLMenu::Item, public ZLMenu {
+
+	public:
+		Submenu(const ZLResource &resource);
+
+		const std::string &menuName() const;
+	};
+
+	class Separator : public ZLMenu::Item {
+
+	public:
+		Separator();
+	};
+
+public:
+	ZLMenubar();
+
+friend class ZLApplication;
+};
+
+class ZLMenuVisitor {
+
+public:
+	virtual ~ZLMenuVisitor();
+	void processMenu(ZLApplication &application);
+
+private:
+	void processMenu(ZLMenu &menu);
+
+protected:
+	virtual void processSubmenuBeforeItems(ZLMenubar::Submenu &submenu) = 0;
+	virtual void processSubmenuAfterItems(ZLMenubar::Submenu &submenu) = 0;
+	virtual void processItem(ZLMenubar::PlainItem &item) = 0;
+	virtual void processSepartor(ZLMenubar::Separator &separator) = 0;
+};
+
+#endif /* __ZLMENU_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLPopupData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLPopupData.h
--- fbreader-0.8.17/zlibrary/core/src/application/ZLPopupData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLPopupData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLPOPUPDATA_H__
+#define __ZLPOPUPDATA_H__
+
+#include <string>
+
+class ZLPopupData {
+
+public:
+	virtual ~ZLPopupData();
+
+	virtual size_t id() const = 0;
+	virtual size_t count() const = 0;
+	virtual const std::string text(size_t index) = 0;
+	virtual void run(size_t index) = 0;
+};
+
+inline ZLPopupData::~ZLPopupData() {
+}
+
+#endif /* __ZLPOPUPDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLToolbar.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLToolbar.cpp
--- fbreader-0.8.17/zlibrary/core/src/application/ZLToolbar.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLToolbar.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,148 +17,297 @@
  * 02110-1301, USA.
  */
 
+#include <stdlib.h>
+
 #include <ZLApplication.h>
 #include <ZLXMLReader.h>
 #include <ZLResource.h>
 #include <ZLibrary.h>
+#include <ZLPopupData.h>
+#include "ZLToolbar.h"
+#include "ZLApplicationWindow.h"
+
+#include <optionEntries/ZLStringInfoEntry.h>
 
 class ZLToolbarCreator : public ZLXMLReader {
 
 public:
-	ZLToolbarCreator(ZLApplication::Toolbar &toolbar);
+	ZLToolbarCreator(ZLToolbar &toolbar);
 	void startElementHandler(const char *tag, const char **attributes);
 
 private:
-	ZLApplication::Toolbar &myToolbar;
+	ZLToolbar &myToolbar;
 };
 
-void ZLApplication::createToolbar() {
-	ZLToolbarCreator(myToolbar).readDocument(ZLibrary::DefaultFilesPathPrefix() + "toolbar.xml");
+void ZLApplication::createToolbar(int index) {
+	toolbar(index);
+	std::string fileName = ZLibrary::DefaultFilesPathPrefix();
+	const bool isWindowToolbar = index == ZLApplicationWindow::WINDOW_TOOLBAR;
+	fileName += isWindowToolbar ? "toolbar.xml" : "fullscreen_toolbar.xml";
+	ZLToolbarCreator(isWindowToolbar ? *myToolbar : *myFullscreenToolbar).readDocument(fileName);
+}
+
+const ZLToolbar &ZLApplication::toolbar(int index) const {
+	if (index == ZLApplicationWindow::WINDOW_TOOLBAR) {
+		if (myToolbar.isNull()) {
+			myToolbar = new ZLToolbar();
+		}
+		return *myToolbar;
+	} else {
+		if (myFullscreenToolbar.isNull()) {
+			myFullscreenToolbar = new ZLToolbar();
+		}
+		return *myFullscreenToolbar;
+	}
+}
+
+void ZLApplication::registerPopupData(const std::string &actionId, shared_ptr<ZLPopupData> popupData) {
+	toolbar(ZLApplicationWindow::WINDOW_TOOLBAR);
+	myToolbar->registerPopupData(actionId, popupData);
 }
 
-ZLToolbarCreator::ZLToolbarCreator(ZLApplication::Toolbar &toolbar) : myToolbar(toolbar) {
+void ZLToolbar::registerPopupData(const std::string &actionId, shared_ptr<ZLPopupData> popupData) {
+	myPopupDataMap[actionId] = popupData;
+}
+
+ZLToolbarCreator::ZLToolbarCreator(ZLToolbar &toolbar) : myToolbar(toolbar) {
 }
 
 void ZLToolbarCreator::startElementHandler(const char *tag, const char **attributes) {
 	static const std::string BUTTON = "button";
+	static const std::string MENU_BUTTON = "menuButton";
+	static const std::string TOGGLE_BUTTON = "toggleButton";
+	static const std::string TEXT_FIELD = "textField";
+	static const std::string COMBO_BOX = "comboBox";
 	static const std::string SEPARATOR = "separator";
 	if (BUTTON == tag) {
 		const char *id = attributeValue(attributes, "id");
 		if (id != 0) {
-			const std::string sid = id;
-			myToolbar.addButton(sid);
+			myToolbar.addPlainButton(id);
+		}
+	} else if (MENU_BUTTON == tag) {
+		const char *id = attributeValue(attributes, "id");
+		if (id != 0) {
+			myToolbar.addMenuButton(id);
+		}
+	} else if (TOGGLE_BUTTON == tag) {
+		const char *id = attributeValue(attributes, "id");
+		const char *groupId = attributeValue(attributes, "group");
+		const char *isDefault = attributeValue(attributes, "default");
+		if ((id != 0) && (groupId != 0)) {
+			myToolbar.addToggleButton(id, groupId, isDefault != 0);
+			/*
+			if (isDefault != 0) {
+				button.press();
+			}
+			*/
+		}
+	} else if ((TEXT_FIELD == tag) || (COMBO_BOX == tag)) {
+		const char *id = attributeValue(attributes, "id");
+		const char *parameterId = attributeValue(attributes, "parameterId");
+		const char *maxWidth = attributeValue(attributes, "maxWidth");
+		const char *symbolSet = attributeValue(attributes, "symbols");
+		if ((id != 0) && (parameterId != 0) && (maxWidth != 0)) {
+			int nMaxWidth = atoi(maxWidth);
+			ZLToolbar::ParameterItem::SymbolSet sSet =
+				((symbolSet != 0) && (std::string(symbolSet) == "digits")) ?
+					ZLToolbar::ParameterItem::SET_DIGITS :
+					ZLToolbar::ParameterItem::SET_ANY;
+			if (nMaxWidth > 0) {
+				myToolbar.addParameterItem(
+					(TEXT_FIELD == tag) ?
+						ZLToolbar::Item::TEXT_FIELD :
+						ZLToolbar::Item::COMBO_BOX,
+					id, parameterId, nMaxWidth, sSet
+				);
+			}
 		}
 	} else if (SEPARATOR == tag) {
 		myToolbar.addSeparator();
 	}
 }
 
-const ZLApplication::Toolbar &ZLApplication::toolbar() const {
-	return myToolbar;
+const ZLToolbar::ItemVector &ZLToolbar::items() const {
+	return myItems;
 }
 
-const ZLApplication::Toolbar::ItemVector &ZLApplication::Toolbar::items() const {
-	return myItems;
+ZLToolbar::Item::Item(const ZLToolbar &toolbar) : myToolbar(toolbar) {
 }
 
-ZLApplication::Toolbar::Item::Item() {
+ZLToolbar::Item::~Item() {
 }
 
-ZLApplication::Toolbar::Item::~Item() {
+const ZLToolbar &ZLToolbar::Item::toolbar() const {
+	return myToolbar;
 }
 
-ZLApplication::Toolbar::ButtonItem::ButtonItem(const std::string &actionId, const ZLResource &tooltip) : myActionId(actionId), myTooltip(tooltip) {
+ZLToolbar::ActionItem::ActionItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip) : Item(toolbar), myActionId(actionId), myTooltip(tooltip) {
 }
 
-const std::string &ZLApplication::Toolbar::ButtonItem::actionId() const {
+const std::string &ZLToolbar::ActionItem::actionId() const {
 	return myActionId;
 }
 
-const std::string &ZLApplication::Toolbar::ButtonItem::iconName() const {
-	return myActionId;
+const std::string &ZLToolbar::ActionItem::tooltip() const {
+	if (!myTooltip.hasValue()) {
+		static const std::string EMPTY;
+		return EMPTY;
+	}
+	return myTooltip.value();
+}
+
+ZLToolbar::AbstractButtonItem::AbstractButtonItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip) : ActionItem(toolbar, actionId, tooltip) {
 }
 
-shared_ptr<ZLApplication::Toolbar::ButtonGroup> ZLApplication::Toolbar::ButtonItem::buttonGroup() const {
-	return myButtonGroup;
+ZLToolbar::PlainButtonItem::PlainButtonItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip) : AbstractButtonItem(toolbar, actionId, tooltip) {
 }
 
-bool ZLApplication::Toolbar::ButtonItem::isToggleButton() const {
-	return !myButtonGroup.isNull();
+ZLToolbar::MenuButtonItem::MenuButtonItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip) : AbstractButtonItem(toolbar, actionId, tooltip) {
 }
 
-void ZLApplication::Toolbar::ButtonItem::press() {
-	if (isToggleButton()) {
-		myButtonGroup->press(this);
+const std::string &ZLToolbar::MenuButtonItem::popupTooltip() const {
+	const ZLResource &popupResource = myTooltip["popup"];
+	if (!popupResource.hasValue()) {
+		static const std::string EMPTY;
+		return EMPTY;
 	}
+	return popupResource.value();
 }
 
-bool ZLApplication::Toolbar::ButtonItem::isPressed() const {
-	return isToggleButton() && (this == myButtonGroup->PressedItem);
+shared_ptr<ZLPopupData> ZLToolbar::MenuButtonItem::popupData() const {
+	std::map<std::string,shared_ptr<ZLPopupData> >::const_iterator it = toolbar().myPopupDataMap.find(actionId());
+	return (it == toolbar().myPopupDataMap.end()) ? 0 : it->second;
 }
 
-shared_ptr<ZLApplication::Toolbar::ButtonGroup> ZLApplication::Toolbar::createButtonGroup(const std::string &unselectAllButtonsActionId) {
-	return new ButtonGroup(unselectAllButtonsActionId);
+ZLToolbar::ToggleButtonItem::ToggleButtonItem(const ZLToolbar &toolbar, const std::string &actionId, ButtonGroup &group, const ZLResource &tooltip) : AbstractButtonItem(toolbar, actionId, tooltip), myGroup(group) {
+	myGroup.myItems.insert(this);
 }
 
-ZLApplication::Toolbar::Toolbar() : myResource(ZLResource::resource("toolbar")) {
+const std::string &ZLToolbar::AbstractButtonItem::iconName() const {
+	return actionId();
 }
 
-void ZLApplication::Toolbar::addButton(const std::string &actionId, shared_ptr<ButtonGroup> group) {
-	ButtonItem *button = new ButtonItem(actionId, myResource[ZLResourceKey(actionId)]);
-	myItems.push_back(button);
-	button->setButtonGroup(group);
+ZLToolbar::ButtonGroup &ZLToolbar::ToggleButtonItem::buttonGroup() {
+	return myGroup;
+}
+
+void ZLToolbar::ToggleButtonItem::press() {
+	myGroup.press(this);
+}
+
+bool ZLToolbar::ToggleButtonItem::isPressed() const {
+	return this == myGroup.myPressedItem;
 }
 
-void ZLApplication::Toolbar::addOptionEntry(shared_ptr<ZLOptionEntry> entry) {
-	if (!entry.isNull()) {
-		myItems.push_back(new OptionEntryItem(entry));
+ZLToolbar::ButtonGroup &ZLToolbar::getButtonGroup(const std::string &id) {
+	shared_ptr<ButtonGroup> group = myButtonGroups[id];
+	if (group.isNull()) {
+		group = new ButtonGroup(id);
+		myButtonGroups[id] = group;
 	}
+	return *group;
 }
 
-void ZLApplication::Toolbar::addSeparator() {
-	myItems.push_back(new SeparatorItem());
+ZLToolbar::ZLToolbar() : myResource(ZLResource::resource("toolbar")) {
 }
 
-ZLApplication::Toolbar::ButtonGroup::ButtonGroup(const std::string &unselectAllButtonsActionId) : UnselectAllButtonsActionId(unselectAllButtonsActionId), PressedItem(0) {
+void ZLToolbar::addPlainButton(const std::string &actionId) {
+	myItems.push_back(
+		new PlainButtonItem(*this, actionId, myResource[ZLResourceKey(actionId)])
+	);
 }
 
-void ZLApplication::Toolbar::ButtonGroup::press(const ButtonItem *item) {
-	PressedItem = item;
+void ZLToolbar::addMenuButton(const std::string &actionId) {
+	myItems.push_back(
+		new MenuButtonItem(*this, actionId, myResource[ZLResourceKey(actionId)])
+	);
 }
 
-void ZLApplication::Toolbar::ButtonItem::setButtonGroup(shared_ptr<ButtonGroup> group) {
-	if (!myButtonGroup.isNull()) {
-		myButtonGroup->Items.erase(this);
+void ZLToolbar::addToggleButton(const std::string &actionId, const std::string &groupId, bool isDefault) {
+	ButtonGroup &group = getButtonGroup(groupId);
+	ToggleButtonItem *button = new ToggleButtonItem(*this, actionId, group, myResource[ZLResourceKey(actionId)]);
+	myItems.push_back(button);
+	if (isDefault) {
+		group.setDefaultAction(actionId);
 	}
-	myButtonGroup = group;
-	if (!myButtonGroup.isNull()) {
-		myButtonGroup->Items.insert(this);
+	if (group.defaultAction() == actionId) {
+		button->press();
 	}
 }
 
-const std::string &ZLApplication::Toolbar::ButtonItem::tooltip() const {
-	if (!myTooltip.hasValue()) {
-		static const std::string EMPTY;
-		return EMPTY;
+void ZLToolbar::addParameterItem(Item::Type type, const std::string &actionId, const std::string &parameterId, int maxWidth, ParameterItem::SymbolSet symbolSet) {
+	ParameterItem *item = (type == Item::TEXT_FIELD) ?
+		(ParameterItem*)new TextFieldItem(*this, actionId, parameterId, maxWidth, symbolSet, myResource[ZLResourceKey(actionId)]) :
+		(ParameterItem*)new ComboBoxItem(*this, actionId, parameterId, maxWidth, symbolSet, myResource[ZLResourceKey(actionId)]);
+	myItems.push_back(item);
+}
+
+void ZLToolbar::addSeparator() {
+	myItems.push_back(new SeparatorItem(*this));
+}
+
+ZLToolbar::ButtonGroup::ButtonGroup(const std::string &groupId) : myPressedItem(0), myDefaultButtonOption(ZLCategoryKey::LOOK_AND_FEEL, "ToggleButtonGroup", groupId, "") {
+}
+
+void ZLToolbar::ButtonGroup::press(const ToggleButtonItem *item) {
+	myPressedItem = item;
+	myDefaultButtonOption.setValue(item->actionId());
+}
+
+void ZLToolbar::ButtonGroup::setDefaultAction(const std::string &actionId) {
+	if (myDefaultButtonOption.value().empty()) {
+		myDefaultButtonOption.setValue(actionId);
 	}
-	return myTooltip.value();
 }
 
-ZLApplication::Toolbar::Item::Type ZLApplication::Toolbar::ButtonItem::type() const {
-	return BUTTON;
+const std::string &ZLToolbar::ButtonGroup::defaultAction() const {
+	return myDefaultButtonOption.value();
+}
+
+ZLToolbar::Item::Type ZLToolbar::PlainButtonItem::type() const {
+	return PLAIN_BUTTON;
+}
+
+ZLToolbar::Item::Type ZLToolbar::MenuButtonItem::type() const {
+	return MENU_BUTTON;
+}
+
+ZLToolbar::Item::Type ZLToolbar::ToggleButtonItem::type() const {
+	return TOGGLE_BUTTON;
 }
 
-ZLApplication::Toolbar::Item::Type ZLApplication::Toolbar::SeparatorItem::type() const {
+ZLToolbar::SeparatorItem::SeparatorItem(const ZLToolbar &toolbar) : Item(toolbar) {
+}
+
+ZLToolbar::Item::Type ZLToolbar::SeparatorItem::type() const {
 	return SEPARATOR;
 }
 
-ZLApplication::Toolbar::OptionEntryItem::OptionEntryItem(shared_ptr<ZLOptionEntry> entry) : myOptionEntry(entry) {
+ZLToolbar::ParameterItem::ParameterItem(const ZLToolbar &toolbar, const std::string &actionId, const std::string &parameterId, int maxWidth, SymbolSet symbolSet, const ZLResource &tooltip) : ActionItem(toolbar, actionId, tooltip), myParameterId(parameterId), myMaxWidth(maxWidth), mySymbolSet(symbolSet) {
+}
+
+const std::string &ZLToolbar::ParameterItem::parameterId() const {
+	return myParameterId;
+}
+
+int ZLToolbar::ParameterItem::maxWidth() const {
+	return myMaxWidth;
+}
+
+ZLToolbar::ParameterItem::SymbolSet ZLToolbar::ParameterItem::symbolSet() const {
+	return mySymbolSet;
+}
+
+ZLToolbar::TextFieldItem::TextFieldItem(const ZLToolbar &toolbar, const std::string &actionId, const std::string &parameterId, int maxWidth, SymbolSet symbolSet, const ZLResource &tooltip) : ParameterItem(toolbar, actionId, parameterId, maxWidth, symbolSet, tooltip) {
+}
+
+ZLToolbar::Item::Type ZLToolbar::TextFieldItem::type() const {
+	return TEXT_FIELD;
 }
 
-shared_ptr<ZLOptionEntry> ZLApplication::Toolbar::OptionEntryItem::entry() const {
-	return myOptionEntry;
+ZLToolbar::ComboBoxItem::ComboBoxItem(const ZLToolbar &toolbar, const std::string &actionId, const std::string &parameterId, int maxWidth, SymbolSet symbolSet, const ZLResource &tooltip) : ParameterItem(toolbar, actionId, parameterId, maxWidth, symbolSet, tooltip) {
 }
 
-ZLApplication::Toolbar::Item::Type ZLApplication::Toolbar::OptionEntryItem::type() const {
-	return OPTION_ENTRY;
+ZLToolbar::Item::Type ZLToolbar::ComboBoxItem::type() const {
+	return COMBO_BOX;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/application/ZLToolbar.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLToolbar.h
--- fbreader-0.8.17/zlibrary/core/src/application/ZLToolbar.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/application/ZLToolbar.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLTOOLBAR_H__
+#define __ZLTOOLBAR_H__
+
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+
+#include <shared_ptr.h>
+#include <ZLOptions.h>
+
+class ZLResource;
+class ZLPopupData;
+
+class ZLToolbar {
+
+public:
+	class Item {
+
+	public:
+		enum Type {
+			PLAIN_BUTTON,
+			MENU_BUTTON,
+			TOGGLE_BUTTON,
+			TEXT_FIELD,
+			COMBO_BOX,
+			SEPARATOR
+		};
+
+	public:
+		Item(const ZLToolbar &toolbar);
+		virtual ~Item();
+
+		virtual Type type() const = 0;
+
+		const ZLToolbar &toolbar() const;
+
+	private:
+		const ZLToolbar &myToolbar;
+	};
+
+	class ActionItem : public Item {
+
+	public:
+		ActionItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip);
+		const std::string &actionId() const;
+		const std::string &tooltip() const;
+
+	private:
+		const std::string myActionId;
+
+	protected:
+		const ZLResource &myTooltip;
+	};
+
+	class AbstractButtonItem : public ActionItem {
+
+	public:
+		AbstractButtonItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip);
+		const std::string &iconName() const;
+	};
+
+	class PlainButtonItem : public AbstractButtonItem {
+
+	public:
+		PlainButtonItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip);
+
+		Type type() const;
+	};
+
+	class MenuButtonItem : public AbstractButtonItem {
+
+	public:
+		MenuButtonItem(const ZLToolbar &toolbar, const std::string &actionId, const ZLResource &tooltip);
+
+		const std::string &popupTooltip() const;
+		shared_ptr<ZLPopupData> popupData() const;
+	
+	private:
+		Type type() const;
+	};
+
+	class ButtonGroup;
+
+	class ToggleButtonItem : public AbstractButtonItem {
+
+	public:
+		ToggleButtonItem(const ZLToolbar &toolbar, const std::string &actionId, ButtonGroup &group, const ZLResource &tooltip);
+
+		Type type() const;
+
+		ButtonGroup &buttonGroup();
+		void press();
+		bool isPressed() const;
+
+	private:
+		ButtonGroup &myGroup;
+	};
+
+	class ButtonGroup {
+
+	private:
+		ButtonGroup(const std::string &groupId);
+		void press(const ToggleButtonItem *item);
+
+		void setDefaultAction(const std::string &actionId);
+		const std::string &defaultAction() const;
+
+	private:
+		typedef std::set<const ToggleButtonItem*> ItemSet;
+
+		ItemSet myItems;
+		const ToggleButtonItem *myPressedItem;
+
+		ZLStringOption myDefaultButtonOption;
+
+	friend class ToggleButtonItem;
+	friend class ZLToolbar;
+	friend class ZLApplicationWindow;
+	};
+
+	class SeparatorItem : public Item {
+
+	public:
+		SeparatorItem(const ZLToolbar &toolbar);
+		Type type() const;
+	};
+
+	class ParameterItem : public ActionItem {
+
+	public:
+		enum SymbolSet {
+			SET_DIGITS,
+			SET_ANY
+		};
+
+	public:
+		ParameterItem(const ZLToolbar &toolbar, const std::string &actionId, const std::string &parameterId, int maxWidth, SymbolSet symbolSet, const ZLResource &tooltip);
+		const std::string &parameterId() const;
+		int maxWidth() const;
+		SymbolSet symbolSet() const;
+
+	private:
+		const std::string myParameterId;
+		const int myMaxWidth;
+		const SymbolSet mySymbolSet;
+	};
+
+	class TextFieldItem : public ParameterItem {
+
+	public:
+		TextFieldItem(const ZLToolbar &toolbar, const std::string &actionId, const std::string &parameterId, int maxWidth, SymbolSet symbolSet, const ZLResource &tooltip);
+		Type type() const;
+	};
+
+	class ComboBoxItem : public ParameterItem {
+
+	public:
+		ComboBoxItem(const ZLToolbar &toolbar, const std::string &actionId, const std::string &parameterId, int maxWidth, SymbolSet symbolSet, const ZLResource &tooltip);
+		Type type() const;
+	};
+
+public:
+	typedef shared_ptr<Item> ItemPtr;
+	typedef std::vector<ItemPtr> ItemVector;
+
+	ZLToolbar();
+	void addPlainButton(const std::string &actionId);
+	void addMenuButton(const std::string &actionId);
+	void addToggleButton(const std::string &actionId, const std::string &groupId, bool isDefault);
+	void addParameterItem(Item::Type type, const std::string &actionId, const std::string &parameterId, int maxWidth, ParameterItem::SymbolSet symbolSet);
+	void addSeparator();
+
+	const ItemVector &items() const;
+
+	void registerPopupData(const std::string &actionId, shared_ptr<ZLPopupData> popupData);
+
+private:
+	ButtonGroup &getButtonGroup(const std::string &id);
+
+private:
+	ItemVector myItems;
+	const ZLResource &myResource;
+	std::map<std::string, shared_ptr<ZLPopupData> > myPopupDataMap;
+	std::map<std::string, shared_ptr<ButtonGroup> > myButtonGroups;
+
+friend class MenuButtonItem;
+friend class ZLApplication;
+};
+
+#endif /* __ZLTOOLBAR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.h
--- fbreader-0.8.17/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/desktop/application/ZLDesktopApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.h
--- fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.h
--- fbreader-0.8.17/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/desktop/dialogs/ZLDesktopSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContentBuilder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContentBuilder.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContentBuilder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContentBuilder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContentBuilder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContentBuilder.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContentBuilder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContentBuilder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContent.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContent.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialog.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialog.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,6 +75,10 @@
 	informationBox(key, dialogMessage(key));
 }
 
+void ZLDialogManager::informationBox(const ZLResourceKey &key, const std::string &message) const {
+	informationBox(dialogTitle(key), message);
+}
+
 void ZLDialogManager::errorBox(const ZLResourceKey &key) const {
 	errorBox(key, dialogMessage(key));
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogManager.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 class ZLOptionsDialog;
 class ZLTreeHandler;
 class ZLApplication;
+class ZLImageData;
 
 class ZLDialogManager {
 
@@ -71,9 +72,12 @@
 	virtual bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const = 0;
 
 	void informationBox(const ZLResourceKey &key) const;
-	virtual void informationBox(const ZLResourceKey &key, const std::string &message) const = 0;
+	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	virtual void informationBox(const std::string &title, const std::string &message) const = 0;
+
 	void errorBox(const ZLResourceKey &key) const;
 	virtual void errorBox(const ZLResourceKey &key, const std::string &message) const = 0;
+
 	int questionBox(const ZLResourceKey &key, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2 = ZLResourceKey()) const;
 	virtual int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2 = ZLResourceKey()) const = 0;
 
@@ -85,6 +89,7 @@
 	};
 	virtual bool isClipboardSupported(ClipboardType type) const = 0;
 	virtual void setClipboardText(const std::string &text, ClipboardType type) const = 0;
+	virtual void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const = 0;
 };
 
 #endif /* __ZLDIALOGMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionsDialog.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionView.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionView.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/dialogs/ZLSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLSelectionDialog.h
--- fbreader-0.8.17/zlibrary/core/src/dialogs/ZLSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/dialogs/ZLSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/DummyEncodingConverter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/DummyEncodingConverter.cpp
--- fbreader-0.8.17/zlibrary/core/src/encoding/DummyEncodingConverter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/DummyEncodingConverter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/DummyEncodingConverter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/DummyEncodingConverter.h
--- fbreader-0.8.17/zlibrary/core/src/encoding/DummyEncodingConverter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/DummyEncodingConverter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/EncodingCollectionReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/EncodingCollectionReader.cpp
--- fbreader-0.8.17/zlibrary/core/src/encoding/EncodingCollectionReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/EncodingCollectionReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/EncodingCollectionReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/EncodingCollectionReader.h
--- fbreader-0.8.17/zlibrary/core/src/encoding/EncodingCollectionReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/EncodingCollectionReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/MyEncodingConverter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/MyEncodingConverter.cpp
--- fbreader-0.8.17/zlibrary/core/src/encoding/MyEncodingConverter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/MyEncodingConverter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include <ZLUnicodeUtil.h>
 #include <ZLibrary.h>
 #include <ZLFile.h>
+#include <ZLDir.h>
 #include <ZLXMLReader.h>
 
 #include "MyEncodingConverter.h"
@@ -111,8 +112,18 @@
 	char myBuffer[3];
 };
 
+MyEncodingConverterProvider::MyEncodingConverterProvider() {
+	shared_ptr<ZLDir> dir =
+		ZLFile(ZLEncodingCollection::encodingDescriptionPath()).directory();
+	if (!dir.isNull()) {
+		std::vector<std::string> files;
+		dir->collectFiles(files, false);
+		myProvidedEncodings.insert(files.begin(), files.end());
+	}
+}
+
 bool MyEncodingConverterProvider::providesConverter(const std::string &encoding) {
-	return ZLFile(ZLEncodingCollection::encodingDescriptionPath() + ZLibrary::FileNameDelimiter + encoding).exists();
+	return myProvidedEncodings.find(encoding) != myProvidedEncodings.end();
 }
 
 shared_ptr<ZLEncodingConverter> MyEncodingConverterProvider::createConverter(const std::string &encoding) {
@@ -132,7 +143,7 @@
 	myEncodingMap = new char[1024];
 	memset(myEncodingMap, '\0', 1024);
 	for (int i = 0; i < 256; ++i) {
-		ZLUnicodeUtil::ucs2ToUtf8(myEncodingMap + 4 * i, i);
+		ZLUnicodeUtil::ucs4ToUtf8(myEncodingMap + 4 * i, i);
 	}
 	if (encodingMap != 0) {
 		for (int i = 0; i < 256; ++i) {
@@ -303,7 +314,7 @@
 			}
 		}
 		int value = strtol(attributes[3], &ptr, 16);
-		int len = ZLUnicodeUtil::ucs2ToUtf8(myBuffer, value);
+		int len = ZLUnicodeUtil::ucs4ToUtf8(myBuffer, value);
 		myMap[index] = new char[len + 1];
 		memcpy(myMap[index], myBuffer, len);
 		myMap[index][len] = '\0';
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/MyEncodingConverter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/MyEncodingConverter.h
--- fbreader-0.8.17/zlibrary/core/src/encoding/MyEncodingConverter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/MyEncodingConverter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,11 +23,17 @@
 #include "ZLEncodingConverter.h"
 #include "ZLEncodingConverterProvider.h"
 
+#include <set>
+
 class MyEncodingConverterProvider : public ZLEncodingConverterProvider {
 
 public:
+	MyEncodingConverterProvider();
 	bool providesConverter(const std::string &encoding);
 	shared_ptr<ZLEncodingConverter> createConverter(const std::string &encoding);
+
+private:
+	std::set<std::string> myProvidedEncodings;
 };
 
 #endif /* __MYENCODINGCONVERTER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingCollection.cpp
--- fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingConverter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingConverter.cpp
--- fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingConverter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingConverter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingConverter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingConverter.h
--- fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingConverter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingConverter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingConverterProvider.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingConverterProvider.h
--- fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingConverterProvider.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingConverterProvider.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingSet.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingSet.cpp
--- fbreader-0.8.17/zlibrary/core/src/encoding/ZLEncodingSet.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/encoding/ZLEncodingSet.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 #include "ZLBzip2InputStream.h"
 
-ZLBzip2InputStream::ZLBzip2InputStream(shared_ptr<ZLInputStream> base) : myBaseStream(base), myBaseBuffer(0) {
+ZLBzip2InputStream::ZLBzip2InputStream(shared_ptr<ZLInputStream> base) : myBaseStream(new ZLInputStreamDecorator(base)), myBaseBuffer(0) {
 	myBzStream.bzalloc = 0;
 	myBzStream.bzfree = 0;
 	myBzStream.opaque = 0;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/bzip2/ZLBzip2InputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef __ZLBZIP2INPUTSTREAM_H__
 #define __ZLBZIP2INPUTSTREAM_H__
 
-#include "bzlib.h"
+#include <bzlib.h>
 
 #include <shared_ptr.h>
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/tar/ZLTar.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/tar/ZLTar.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/tar/ZLTar.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/tar/ZLTar.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,16 +27,68 @@
 	std::string Name;
 	size_t Size;
 	bool IsRegularFile;
+	size_t DataOffset;
 
-	bool read(shared_ptr<ZLInputStream> stream);
+	bool read(ZLInputStream &stream);
 	void erase();
 };
 
-bool ZLTarHeader::read(shared_ptr<ZLInputStream> stream) {
-	size_t startOffset = stream->offset();
+class ZLTarHeaderCache : public ZLUserData {
+
+public:
+	static const ZLTarHeaderCache &cache(ZLInputStream &baseStream);
+
+public:
+	ZLTarHeaderCache(ZLInputStream &baseStream);
+	ZLTarHeader header(const std::string &entryName) const;
+	void collectFileNames(std::vector<std::string> &names) const;
+
+private:
+	std::map<std::string,ZLTarHeader> myHeaderMap;
+};
+
+ZLTarHeaderCache::ZLTarHeaderCache(ZLInputStream &baseStream) {
+	if (!baseStream.open()) {
+		return;
+	}
+
+	ZLTarHeader header;
+	while (header.read(baseStream)) {
+		if (header.IsRegularFile) {
+			myHeaderMap[header.Name] = header;
+		}
+		baseStream.seek((header.Size + 0x1ff) & -0x200, false);
+		header.erase();
+	}
+	baseStream.close();
+}
+
+ZLTarHeader ZLTarHeaderCache::header(const std::string &entryName) const {
+	std::map<std::string,ZLTarHeader>::const_iterator it = myHeaderMap.find(entryName);
+	return (it != myHeaderMap.end()) ? it->second : ZLTarHeader();
+}
+
+void ZLTarHeaderCache::collectFileNames(std::vector<std::string> &names) const {
+	for (std::map<std::string,ZLTarHeader>::const_iterator it = myHeaderMap.begin(); it != myHeaderMap.end(); ++it) {
+		names.push_back(it->first);
+	}
+}
+
+const ZLTarHeaderCache &ZLTarHeaderCache::cache(ZLInputStream &baseStream) {
+	static const std::string tarHeaderMapKey = "tarHeaderMap";
+	shared_ptr<ZLUserData> data = baseStream.getUserData(tarHeaderMapKey);
+	if (data.isNull()) {
+		data = new ZLTarHeaderCache(baseStream);
+		baseStream.addUserData(tarHeaderMapKey, data);
+	}
+	return (const ZLTarHeaderCache&)*data;
+}
+
+bool ZLTarHeader::read(ZLInputStream &stream) {
+	size_t startOffset = stream.offset();
 
 	char fileName[101];
-	stream->read(fileName, 100);
+	stream.read(fileName, 100);
 	if (fileName[0] == '\0') {
 		return false;
 	}
@@ -45,10 +97,10 @@
 		Name = fileName;
 	}
 
-	stream->seek(24, false);
+	stream.seek(24, false);
 	
 	char fileSizeString[12];
-	stream->read(fileSizeString, 12);
+	stream.read(fileSizeString, 12);
 	Size = 0;
 	for (int i = 0; i < 12; ++i) {
 		if (!isdigit(fileSizeString[i])) {
@@ -58,23 +110,24 @@
 		Size += fileSizeString[i] - '0';
 	}
 	
-	stream->seek(20, false);
+	stream.seek(20, false);
 	char linkFlag;
-	stream->read(&linkFlag, 1);
+	stream.read(&linkFlag, 1);
 	
 	IsRegularFile = (linkFlag == '\0') || (linkFlag == '0');
 
-	stream->seek(355, false);
+	stream.seek(355, false);
 	
 	if (((linkFlag == 'L') || (linkFlag == 'K')) && (Name == "././@LongLink") && (Size < 10240)) {
 		Name.erase();
 		Name.append(Size - 1, '\0');
-		stream->read(const_cast<char*>(Name.data()), Size - 1);
+		stream.read(const_cast<char*>(Name.data()), Size - 1);
 		const int skip = 512 - (Size & 0x1ff);
-		stream->seek(skip + 1, false);
-		return (stream->offset() == startOffset + Size + skip + 512) && read(stream);
+		stream.seek(skip + 1, false);
+		return (stream.offset() == startOffset + Size + skip + 512) && read(stream);
 	} else {
-		return stream->offset() == startOffset + 512;
+		DataOffset = stream.offset();
+		return DataOffset == startOffset + 512;
 	}
 }
 
@@ -82,7 +135,7 @@
 	Name.erase();
 }
 
-ZLTarInputStream::ZLTarInputStream(shared_ptr<ZLInputStream> &base, const std::string &name) : myBaseStream(base), myCompressedFileName(name) {
+ZLTarInputStream::ZLTarInputStream(shared_ptr<ZLInputStream> &base, const std::string &name) : myBaseStream(new ZLInputStreamDecorator(base)), myCompressedFileName(name) {
 }
 
 ZLTarInputStream::~ZLTarInputStream() {
@@ -94,19 +147,20 @@
 	if (!myBaseStream->open()) {
 		return false;
 	}
-	myOffset = 0;
 
-	ZLTarHeader header;
-	while (header.read(myBaseStream)) {
-		if ((header.IsRegularFile) && (header.Name == myCompressedFileName)) {
-			myCompressedFileSize = header.Size;
-			return true;
-		}
-		myBaseStream->seek((header.Size + 0x1ff) & -0x200, false);
-		header.erase();
+	const ZLTarHeaderCache &cache = ZLTarHeaderCache::cache(*myBaseStream);
+	const ZLTarHeader header = cache.header(myCompressedFileName);
+	if (header.Name.empty()) {
+		return false;
 	}
-	myBaseStream->close();
-	return false;
+
+	if (!myBaseStream->open()) {
+		return false;
+	}
+	myOffset = 0;
+	myCompressedFileSize = header.Size;
+	myBaseStream->seek(header.DataOffset, true);
+	return true;
 }
 
 size_t ZLTarInputStream::read(char *buffer, size_t maxSize) {
@@ -139,18 +193,8 @@
 
 void ZLTarDir::collectFiles(std::vector<std::string> &names, bool) {
 	shared_ptr<ZLInputStream> stream = ZLFile(path()).inputStream();
-
-	if (!stream.isNull() && stream->open()) {
-		ZLTarHeader header;
-		while (header.read(stream)) {
-			if (header.IsRegularFile) {
-				names.push_back(header.Name);
-			}
-			stream->seek((header.Size + 0x1ff) & -0x200, false);
-			header.erase();
-		}
-		stream->close();
-	}
+	const ZLTarHeaderCache &cache = ZLTarHeaderCache::cache(*stream);
+	cache.collectFileNames(names);
 }
 
 std::string ZLTarDir::delimiter() const {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/tar/ZLTar.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/tar/ZLTar.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/tar/ZLTar.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/tar/ZLTar.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLGzipInputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLGzipInputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLGzipInputStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLGzipInputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include "ZLZip.h"
 #include "ZLZDecompressor.h"
 
-ZLGzipInputStream::ZLGzipInputStream(shared_ptr<ZLInputStream> stream) : myFileStream(stream), myFileSize(0) {
+ZLGzipInputStream::ZLGzipInputStream(shared_ptr<ZLInputStream> stream) : myBaseStream(new ZLInputStreamDecorator(stream)), myFileSize(0) {
 }
 
 ZLGzipInputStream::~ZLGzipInputStream() {
@@ -30,21 +30,21 @@
 bool ZLGzipInputStream::open() {
 	close();
 
-	if (!myFileStream->open()) {
+	if (!myBaseStream->open()) {
 		return false;
 	}
 
-	myFileSize = myFileStream->sizeOfOpened();
+	myFileSize = myBaseStream->sizeOfOpened();
 
 	unsigned char id1;
 	unsigned char id2;
 	unsigned char cm;
 
-	myFileStream->read((char*)&id1, 1);
-	myFileStream->read((char*)&id2, 1);
-	myFileStream->read((char*)&cm, 1);
+	myBaseStream->read((char*)&id1, 1);
+	myBaseStream->read((char*)&id2, 1);
+	myBaseStream->read((char*)&cm, 1);
 	if ((id1 != 31) || (id2 != 139) || (cm != 8)) {
-		myFileStream->close();
+		myBaseStream->close();
 		return false;
 	}
 
@@ -54,46 +54,46 @@
 	const unsigned char FNAME = 1 << 3;
 	const unsigned char FCOMMENT = 1 << 4;
 	unsigned char flg;
-	myFileStream->read((char*)&flg, 1);
-	myFileStream->seek(6, false);
+	myBaseStream->read((char*)&flg, 1);
+	myBaseStream->seek(6, false);
 	if (flg & FEXTRA) {
 		unsigned char b0, b1;
-		myFileStream->read((char*)&b0, 1);
-		myFileStream->read((char*)&b1, 1);
+		myBaseStream->read((char*)&b0, 1);
+		myBaseStream->read((char*)&b1, 1);
 		unsigned short xlen = (((unsigned short)b1) << 8) + b0;
-		myFileStream->seek(xlen, false);
+		myBaseStream->seek(xlen, false);
 	}
 	if (flg & FNAME) {
 		unsigned char b;
 		do {
-			myFileStream->read((char*)&b, 1);
+			myBaseStream->read((char*)&b, 1);
 		} while (b != 0);
 	}
 	if (flg & FCOMMENT) {
 		unsigned char b;
 		do {
-			myFileStream->read((char*)&b, 1);
+			myBaseStream->read((char*)&b, 1);
 		} while (b != 0);
 	}
 	if (flg & FHCRC) {
-		myFileStream->seek(2, false);
+		myBaseStream->seek(2, false);
 	}
 
-	myDecompressor = new ZLZDecompressor(myFileSize - myFileStream->offset() - 8);
+	myDecompressor = new ZLZDecompressor(myFileSize - myBaseStream->offset() - 8);
 	myOffset = 0;
 
 	return true;
 }
 
 size_t ZLGzipInputStream::read(char *buffer, size_t maxSize) {
-	size_t realSize = myDecompressor->decompress(*myFileStream, buffer, maxSize);
+	size_t realSize = myDecompressor->decompress(*myBaseStream, buffer, maxSize);
 	myOffset += realSize;
 	return realSize;
 }
 
 void ZLGzipInputStream::close() {
 	myDecompressor = 0;
-	myFileStream->close();
+	myBaseStream->close();
 }
 
 void ZLGzipInputStream::seek(int offset, bool absoluteOffset) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZDecompressor.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZDecompressor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZDecompressor.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZDecompressor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZDecompressor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipDir.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipDir.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipDir.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipDir.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,21 +23,8 @@
 
 void ZLZipDir::collectFiles(std::vector<std::string> &names, bool) {
 	shared_ptr<ZLInputStream> stream = ZLFile(path()).inputStream();
-
-	if (!stream.isNull() && stream->open()) {
-		ZLZipHeader header;
-		while (header.readFrom(*stream)) {
-			char *buffer = new char[header.NameLength];
-			if ((unsigned int)stream->read(buffer, header.NameLength) == header.NameLength) {
-				std::string entryName;
-				entryName.append(buffer, header.NameLength);
-				names.push_back(entryName);
-			}
-			delete[] buffer;
-			ZLZipHeader::skipEntry(*stream, header);
-		}
-		stream->close();
-	}
+	const ZLZipEntryCache &cache = ZLZipEntryCache::cache(*stream);
+	cache.collectFileNames(names);
 }
 
 std::string ZLZipDir::delimiter() const {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipEntryCache.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipEntryCache.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipEntryCache.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipEntryCache.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLZip.h"
+#include "ZLZipHeader.h"
+
+ZLZipEntryCache::Info::Info() : Offset(-1) {
+}
+
+const ZLZipEntryCache &ZLZipEntryCache::cache(ZLInputStream &stream) {
+	static const std::string zipEntryMapKey = "zipEntryMap";
+	shared_ptr<ZLUserData> data = stream.getUserData(zipEntryMapKey);
+	if (data.isNull()) {
+		data = new ZLZipEntryCache(stream);
+		stream.addUserData(zipEntryMapKey, data);
+	}
+	return (const ZLZipEntryCache&)*data;
+}
+
+ZLZipEntryCache::ZLZipEntryCache(ZLInputStream &baseStream) {
+	if (!baseStream.open()) {
+		return;
+	}
+
+	ZLZipHeader header;
+	while (header.readFrom(baseStream)) {
+		std::string entryName(header.NameLength, '\0');
+		if ((unsigned int)baseStream.read((char*)entryName.data(), header.NameLength) == header.NameLength) {
+			Info &info = myInfoMap[entryName];
+			info.Offset = baseStream.offset() + header.ExtraLength;
+			info.CompressionMethod = header.CompressionMethod;
+			info.CompressedSize = header.CompressedSize;
+			info.UncompressedSize = header.UncompressedSize;
+		}
+		ZLZipHeader::skipEntry(baseStream, header);
+	}
+	baseStream.close();
+}
+
+ZLZipEntryCache::Info ZLZipEntryCache::info(const std::string &entryName) const {
+	std::map<std::string,Info>::const_iterator it = myInfoMap.find(entryName);
+	return (it != myInfoMap.end()) ? it->second : Info();
+}
+
+void ZLZipEntryCache::collectFileNames(std::vector<std::string> &names) const {
+	for (std::map<std::string,Info>::const_iterator it = myInfoMap.begin(); it != myInfoMap.end(); ++it) {
+		names.push_back(it->first);
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZip.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZip.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZip.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZip.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,17 +20,44 @@
 #ifndef __ZLZIP_H__
 #define __ZLZIP_H__
 
+#include <map>
+
 #include <shared_ptr.h>
 
 #include "../ZLInputStream.h"
 #include "../ZLDir.h"
 
 class ZLZDecompressor;
+class ZLFile;
+
+class ZLZipEntryCache : public ZLUserData {
+
+public:
+	static const ZLZipEntryCache &cache(ZLInputStream &baseStream);
+
+public:
+	struct Info {
+		Info();
+
+		int Offset;
+		int CompressionMethod;
+		int CompressedSize;
+		int UncompressedSize;
+	};
+
+public:
+	ZLZipEntryCache(ZLInputStream &baseStream);
+	Info info(const std::string &entryName) const;
+	void collectFileNames(std::vector<std::string> &names) const;
+
+private:
+	std::map<std::string,Info> myInfoMap;
+};
 
 class ZLZipInputStream : public ZLInputStream {
 
 private:
-	ZLZipInputStream(shared_ptr<ZLInputStream> &base, const std::string &name);
+	ZLZipInputStream(shared_ptr<ZLInputStream> &base, const std::string &entryName);
 
 public:
 	~ZLZipInputStream();
@@ -44,7 +71,7 @@
 
 private:
 	shared_ptr<ZLInputStream> myBaseStream;
-	std::string myCompressedFileName;
+	std::string myEntryName;
 	bool myIsDeflated;
 
 	size_t myUncompressedSize;
@@ -72,7 +99,7 @@
 	size_t sizeOfOpened();
 
 private:
-	shared_ptr<ZLInputStream> myFileStream;
+	shared_ptr<ZLInputStream> myBaseStream;
 	size_t myFileSize;
 
 	size_t myOffset;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipHeader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipHeader.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipHeader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipHeader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipHeader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipHeader.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipHeader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipHeader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipInputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipInputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/zip/ZLZipInputStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/zip/ZLZipInputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include "ZLZDecompressor.h"
 #include "../ZLFSManager.h"
 
-ZLZipInputStream::ZLZipInputStream(shared_ptr<ZLInputStream> &base, const std::string &name) : myBaseStream(base), myCompressedFileName(name), myUncompressedSize(0) {
+ZLZipInputStream::ZLZipInputStream(shared_ptr<ZLInputStream> &base, const std::string &entryName) : myBaseStream(new ZLInputStreamDecorator(base)), myEntryName(entryName), myUncompressedSize(0) {
 }
 
 ZLZipInputStream::~ZLZipInputStream() {
@@ -34,41 +34,29 @@
 bool ZLZipInputStream::open() {
 	close();
 
+	const ZLZipEntryCache &cache = ZLZipEntryCache::cache(*myBaseStream);
+	ZLZipEntryCache::Info info = cache.info(myEntryName);
+
 	if (!myBaseStream->open()) {
 		return false;
 	}
 
-	ZLZipHeader header;
-	while (true) {
-		if (!header.readFrom(*myBaseStream)) {
-			close();
-			return false;
-		}
-		if (header.NameLength == myCompressedFileName.length()) {
-			char *buffer = new char[header.NameLength];
-			myBaseStream->read(buffer, header.NameLength);
-			std::string str;
-			str.append(buffer, header.NameLength);
-			delete[] buffer;
-			if (str == myCompressedFileName) {
-				myBaseStream->seek(header.ExtraLength, false);
-				break;
-			}
-		} else {
-			myBaseStream->seek(header.NameLength, false);
-		}
-		ZLZipHeader::skipEntry(*myBaseStream, header);
+	if (info.Offset == -1) {
+		close();
+		return false;
 	}
-	if (header.CompressionMethod == 0) {
+	myBaseStream->seek(info.Offset, true);
+
+	if (info.CompressionMethod == 0) {
 		myIsDeflated = false;
-	} else if (header.CompressionMethod == 8) {
+	} else if (info.CompressionMethod == 8) {
 		myIsDeflated = true;
 	} else {
 		close();
 		return false;
 	}
-	myUncompressedSize = header.UncompressedSize;
-	myAvailableSize = header.CompressedSize;
+	myUncompressedSize = info.UncompressedSize;
+	myAvailableSize = info.CompressedSize;
 	if (myAvailableSize == 0) {
 		myAvailableSize = (size_t)-1;
 	}
@@ -82,21 +70,23 @@
 }
 
 size_t ZLZipInputStream::read(char *buffer, size_t maxSize) {
+	size_t realSize = 0;
 	if (myIsDeflated) {
-		size_t realSize = myDecompressor->decompress(*myBaseStream, buffer, maxSize);
+		realSize = myDecompressor->decompress(*myBaseStream, buffer, maxSize);
 		myOffset += realSize;
-		return realSize;
 	} else {
-		size_t realSize = std::min(maxSize, myAvailableSize);
+		realSize = myBaseStream->read(buffer, std::min(maxSize, myAvailableSize));
 		myAvailableSize -= realSize;
 		myOffset += realSize;
-		return myBaseStream->read(buffer, realSize);
 	}
+	return realSize;
 }
 
 void ZLZipInputStream::close() {
 	myDecompressor = 0;
-	myBaseStream->close();
+	if (!myBaseStream.isNull()) {
+		myBaseStream->close();
+	}
 }
 
 void ZLZipInputStream::seek(int offset, bool absoluteOffset) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLDir.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLDir.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLDir.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLDir.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLDir.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLDir.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLDir.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFile.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFile.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFile.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFile.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@
 #include "bzip2/ZLBzip2InputStream.h"
 #include "ZLFSManager.h"
 
+std::map<std::string,weak_ptr<ZLInputStream> > ZLFile::ourPlainStreamCache;
+
 ZLFile::ZLFile(const std::string &path) : myPath(path), myInfoIsFilled(false) {
 	ZLFSManager::instance().normalize(myPath);
 	{
@@ -71,21 +73,37 @@
 
 	int index = myNameWithoutExtension.rfind('.');
 	if (index > 0) {
-		myExtension = myNameWithoutExtension.substr(index + 1);
+		myExtension = ZLUnicodeUtil::toLower(myNameWithoutExtension.substr(index + 1));
 		myNameWithoutExtension = myNameWithoutExtension.substr(0, index);
 	}
 }
 
-shared_ptr<ZLInputStream> ZLFile::inputStream() const {
-	if (isDirectory()) {
-		return 0;
+shared_ptr<ZLInputStream> ZLFile::envelopeCompressedStream(shared_ptr<ZLInputStream> &base) const {
+	if (base != 0) {
+		if (myArchiveType & GZIP) {
+			return new ZLGzipInputStream(base);
+		}
+		if (myArchiveType & BZIP2) {
+			return new ZLBzip2InputStream(base);
+		}
 	}
+	return base;
+}
 
-	ZLInputStream *stream = 0;
+shared_ptr<ZLInputStream> ZLFile::inputStream() const {
+	shared_ptr<ZLInputStream> stream;
 	
 	int index = ZLFSManager::instance().findArchiveFileNameDelimiter(myPath);
 	if (index == -1) {
-		stream = ZLFSManager::instance().createPlainInputStream(myPath);
+		stream = ourPlainStreamCache[myPath];
+		if (stream.isNull()) {
+			if (isDirectory()) {
+				return 0;
+			}
+			stream = ZLFSManager::instance().createPlainInputStream(myPath);
+			stream = envelopeCompressedStream(stream);
+			ourPlainStreamCache[myPath] = stream;
+		}
 	} else {
 		ZLFile baseFile(myPath.substr(0, index));
 		shared_ptr<ZLInputStream> base = baseFile.inputStream();
@@ -96,16 +114,9 @@
 				stream = new ZLTarInputStream(base, myPath.substr(index + 1));
 			}
 		}
+		stream = envelopeCompressedStream(stream);
 	}
 
-	if (stream != 0) {
-		if (myArchiveType & GZIP) {
-			return new ZLGzipInputStream(stream);
-		}
-		if (myArchiveType & BZIP2) {
-			return new ZLBzip2InputStream(stream);
-		}
-	}
 	return stream;
 }
 
@@ -136,30 +147,36 @@
 }
 
 void ZLFile::fillInfo() const {
+	myInfoIsFilled = true;
+
 	int index = ZLFSManager::instance().findArchiveFileNameDelimiter(myPath);
 	if (index == -1) {
 		myInfo = ZLFSManager::instance().fileInfo(myPath);
 	} else {
-		std::string archivePath = myPath.substr(0, index);
+		const std::string archivePath = myPath.substr(0, index);
 		ZLFile archive(archivePath);
 		if (archive.exists()) {
-			std::string itemName = myPath.substr(index + 1);
-			myInfo = archive.myInfo;
-			myInfo.IsDirectory = false;
-			myInfo.Exists = false;
-			std::vector<std::string> items;
-			archive.directory()->collectFiles(items, true);
-			for (std::vector<std::string>::const_iterator it = items.begin(); it != items.end(); ++it) {
-				if (*it == itemName) {
-					myInfo.Exists = true;
-					break;
+			shared_ptr<ZLDir> dir = archive.directory();
+			if (!dir.isNull()) {
+				std::string itemName = myPath.substr(index + 1);
+				myInfo = archive.myInfo;
+				myInfo.IsDirectory = false;
+				myInfo.Exists = false;
+				std::vector<std::string> items;
+				dir->collectFiles(items, true);
+				for (std::vector<std::string>::const_iterator it = items.begin(); it != items.end(); ++it) {
+					if (*it == itemName) {
+						myInfo.Exists = true;
+						break;
+					}
 				}
+			} else {
+				myInfo.Exists = false;
 			}
 		} else {
 			myInfo.Exists = false;
 		}
 	}
-	myInfoIsFilled = true;
 }
 
 bool ZLFile::remove() const {
@@ -181,12 +198,40 @@
 std::string ZLFile::physicalFilePath() const {
 	std::string path = myPath;
 	int index;
-	while ((index = ZLFSManager::instance().findArchiveFileNameDelimiter(path)) != -1) {
+	const ZLFSManager &manager = ZLFSManager::instance();
+	while ((index = manager.findArchiveFileNameDelimiter(path)) != -1) {
 		path = path.substr(0, index);
 	}
 	return path;
 }
 
+std::string ZLFile::resolvedPath() const {
+	std::string physical = physicalFilePath();
+	std::string postfix = myPath.substr(physical.length());
+	return ZLFSManager::instance().resolveSymlink(physical) + postfix;
+}
+
 std::string ZLFile::fileNameToUtf8(const std::string &fileName) {
 	return ZLFSManager::instance().convertFilenameToUtf8(fileName);
 }
+
+bool ZLFile::exists() const {
+	if (!myInfoIsFilled) {
+		fillInfo();
+	}
+	return myInfo.Exists;
+}
+
+size_t ZLFile::size() const {
+	if (!myInfoIsFilled) {
+		fillInfo();
+	}
+	return myInfo.Size;
+}
+
+bool ZLFile::isDirectory() const {
+	if (!myInfoIsFilled) {
+		fillInfo();
+	}
+	return myInfo.IsDirectory;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFile.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFile.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFile.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFile.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #define __ZLFILE_H__
 
 #include <string>
+#include <map>
 
 #include <shared_ptr.h>
 #include <ZLFileInfo.h>
@@ -31,6 +32,9 @@
 
 class ZLFile {
 
+private:
+	static std::map<std::string,weak_ptr<ZLInputStream> > ourPlainStreamCache;
+
 public:
 	static std::string fileNameToUtf8(const std::string &fileName);
 
@@ -50,10 +54,10 @@
 	~ZLFile();
 
 	bool exists() const;
-	unsigned long mTime() const;
 	size_t size() const;	
 
 	void forceArchiveType(ArchiveType type);
+
 	bool isCompressed() const;
 	bool isDirectory() const;
 	bool isArchive() const;
@@ -65,6 +69,7 @@
 	const std::string &extension() const;
 
 	std::string physicalFilePath() const;
+	std::string resolvedPath() const;
 
 	shared_ptr<ZLInputStream> inputStream() const;
 	shared_ptr<ZLOutputStream> outputStream() const;
@@ -72,6 +77,7 @@
 
 private:
 	void fillInfo() const;
+	shared_ptr<ZLInputStream> envelopeCompressedStream(shared_ptr<ZLInputStream> &base) const;
 
 private:
 	std::string myPath;
@@ -85,12 +91,7 @@
 
 inline ZLFile::~ZLFile() {}
 
-inline bool ZLFile::exists() const { if (!myInfoIsFilled) fillInfo(); return myInfo.Exists; }
-inline unsigned long ZLFile::mTime() const { if (!myInfoIsFilled) fillInfo(); return myInfo.MTime; }
-inline size_t ZLFile::size() const { if (!myInfoIsFilled) fillInfo(); return myInfo.Size; }
-	
 inline bool ZLFile::isCompressed() const { return myArchiveType & COMPRESSED; }
-inline bool ZLFile::isDirectory() const { if (!myInfoIsFilled) fillInfo(); return myInfo.IsDirectory; }
 inline bool ZLFile::isArchive() const { return myArchiveType & ARCHIVE; }
 
 inline const std::string &ZLFile::path() const { return myPath; }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFileInfo.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFileInfo.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFileInfo.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFileInfo.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 struct ZLFileInfo {
 	bool Exists;
 	bool IsDirectory;
-	unsigned long MTime;
 	unsigned long Size;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFSDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFSDir.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFSDir.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFSDir.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFSManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFSManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,14 @@
 	}
 }
 
+int ZLFSManager::findLastFileNameDelimiter(const std::string &path) const {
+	int index = findArchiveFileNameDelimiter(path);
+	if (index == -1) {
+		index = path.rfind(ZLibrary::FileNameDelimiter);
+	}
+	return index;
+}
+
 std::string ZLFSDir::delimiter() const {
 	return ZLibrary::FileNameDelimiter;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFSManager.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLFSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLFSManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,7 +45,8 @@
 	virtual ~ZLFSManager();
 	
 public:
-	virtual void normalize(std::string &path) const;
+	virtual void normalize(std::string &path) const = 0;
+	virtual std::string resolveSymlink(const std::string &path) const = 0;
 
 protected:
 	virtual ZLInputStream *createPlainInputStream(const std::string &path) const = 0;
@@ -57,7 +58,7 @@
 	virtual std::string convertFilenameToUtf8(const std::string &name) const = 0;
 
 	virtual int findArchiveFileNameDelimiter(const std::string &path) const = 0;
-	virtual int findLastFileNameDelimiter(const std::string &path) const = 0;
+	int findLastFileNameDelimiter(const std::string &path) const;
 	virtual shared_ptr<ZLDir> rootDirectory() const = 0;
 	virtual const std::string &rootDirectoryPath() const = 0;
 	virtual std::string parentPath(const std::string &path) const = 0;
@@ -72,6 +73,5 @@
 inline ZLFSManager &ZLFSManager::instance() { return *ourInstance; }
 inline ZLFSManager::ZLFSManager() {}
 inline ZLFSManager::~ZLFSManager() {}
-inline void ZLFSManager::normalize(std::string&) const {}
 
 #endif /* __ZLFSMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLInputStreamDecorator.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLInputStream.h"
+
+ZLInputStreamDecorator::ZLInputStreamDecorator(shared_ptr<ZLInputStream> decoratee) : myBaseStream(decoratee), myBaseOffset(0) {
+}
+
+bool ZLInputStreamDecorator::open() {
+	bool result = myBaseStream->open();
+	myBaseOffset = myBaseStream->offset();
+	return result;
+}
+
+size_t ZLInputStreamDecorator::read(char *buffer, size_t maxSize) {
+	myBaseStream->seek(myBaseOffset, true);
+	size_t result = myBaseStream->read(buffer, maxSize);
+	myBaseOffset = myBaseStream->offset();
+	return result;
+}
+
+void ZLInputStreamDecorator::close() {
+	myBaseStream->close();
+}
+
+void ZLInputStreamDecorator::seek(int offset, bool absoluteOffset) {
+	if (absoluteOffset) {
+		myBaseStream->seek(offset, true);
+	} else {
+		myBaseStream->seek(myBaseOffset + offset, true);
+	}
+	myBaseOffset = myBaseStream->offset();
+}
+
+size_t ZLInputStreamDecorator::offset() const {
+	return myBaseOffset;
+}
+
+size_t ZLInputStreamDecorator::sizeOfOpened() {
+	return myBaseStream->sizeOfOpened();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLInputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLInputStream.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLInputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLInputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,10 @@
 
 #include <string>
 
-class ZLInputStream {
+#include <shared_ptr.h>
+#include <ZLUserData.h>
+
+class ZLInputStream : public ZLUserDataHolder {
 
 protected:
 	ZLInputStream();
@@ -43,6 +46,25 @@
 	const ZLInputStream &operator = (const ZLInputStream&);
 };
 
+class ZLInputStreamDecorator : public ZLInputStream {
+
+public:
+	ZLInputStreamDecorator(shared_ptr<ZLInputStream> decoratee);
+
+private:
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	shared_ptr<ZLInputStream> myBaseStream;
+	size_t myBaseOffset;
+};
+
 inline ZLInputStream::ZLInputStream() {}
 inline ZLInputStream::~ZLInputStream() {}
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/filesystem/ZLOutputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLOutputStream.h
--- fbreader-0.8.17/zlibrary/core/src/filesystem/ZLOutputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/filesystem/ZLOutputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 public:
 	virtual ~ZLOutputStream();
 	virtual bool open() = 0;
+	virtual void write(const char *data, size_t len) = 0;
 	virtual void write(const std::string &str) = 0;
 	virtual void close() = 0;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLFileImage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLFileImage.cpp
--- fbreader-0.8.17/zlibrary/core/src/image/ZLFileImage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLFileImage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLFileImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLFileImage.h
--- fbreader-0.8.17/zlibrary/core/src/image/ZLFileImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLFileImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLImage.h
--- fbreader-0.8.17/zlibrary/core/src/image/ZLImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLImageManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLImageManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/image/ZLImageManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLImageManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLImageManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLImageManager.h
--- fbreader-0.8.17/zlibrary/core/src/image/ZLImageManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLImageManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLStreamImage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLStreamImage.cpp
--- fbreader-0.8.17/zlibrary/core/src/image/ZLStreamImage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLStreamImage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/image/ZLStreamImage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLStreamImage.h
--- fbreader-0.8.17/zlibrary/core/src/image/ZLStreamImage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/image/ZLStreamImage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageDetector.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageDetector.cpp
--- fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageDetector.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageDetector.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <ZLFile.h>
+#include <ZLInputStream.h>
 #include <ZLDir.h>
 #include <ZLUnicodeUtil.h>
 
@@ -51,7 +53,9 @@
 }
 
 ZLLanguageDetector::ZLLanguageDetector() {
-	shared_ptr<ZLDir> dir = ZLLanguageList::patternsDirectory();
+	const ZLFile patternsArchive(ZLLanguageList::patternsDirectoryPath());
+	shared_ptr<ZLInputStream> lock = patternsArchive.inputStream();
+	shared_ptr<ZLDir> dir = patternsArchive.directory(false);
 	if (!dir.isNull()) {
 		std::vector<std::string> fileNames;
 		dir->collectFiles(fileNames, false);
@@ -86,6 +90,15 @@
 	const char *start = buffer;
 	const char *end = start + length;
 
+	if (end >= start + 2) {
+		if ((*start == (const char)0xFF) && (*(start + 1) == (const char)0xFE)) {
+			return new LanguageInfo("", "UTF-16");
+		}
+		if ((*start == (const char)0xFE) && (*(start + 1) == (const char)0xFF)) {
+			return new LanguageInfo("", "UTF-16BE");
+		}
+	}
+
 	enum { ASCII, UTF8, OTHER } encodingType = ASCII;
 	int nonLeadingCharsCounter = 0;
 	for (const char *ptr = start; ptr != end; ++ptr) {
@@ -166,10 +179,12 @@
 		}
 	}
 
-	if (!info.isNull() &&
-			(encodingType == UTF8) &&
-			(info->Encoding != ZLLanguageMatcher::UTF8_ENCODING_NAME)) {
-		return new LanguageInfo(info->Language, ZLLanguageMatcher::UTF8_ENCODING_NAME);
+	if (encodingType == UTF8) {
+		if (info.isNull()) {
+			return new LanguageInfo("", ZLLanguageMatcher::UTF8_ENCODING_NAME);
+		} else if (info->Encoding != ZLLanguageMatcher::UTF8_ENCODING_NAME) {
+			return new LanguageInfo(info->Language, ZLLanguageMatcher::UTF8_ENCODING_NAME);
+		}
 	}
 	return info;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageDetector.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageDetector.h
--- fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageDetector.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageDetector.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageList.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageList.cpp
--- fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageList.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageList.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,10 +27,8 @@
 
 std::vector<std::string> ZLLanguageList::ourLanguageCodes;
 
-shared_ptr<ZLDir> ZLLanguageList::patternsDirectory() {
-	const std::string dirName =
-		ZLibrary::ZLibraryDirectory() + ZLibrary::FileNameDelimiter + "languagePatterns.zip";
-	return ZLFile(dirName).directory(false);
+std::string ZLLanguageList::patternsDirectoryPath() {
+	return ZLibrary::ZLibraryDirectory() + ZLibrary::FileNameDelimiter + "languagePatterns.zip";
 }
 
 std::string ZLLanguageList::languageName(const std::string &code) {
@@ -41,7 +39,7 @@
 	if (ourLanguageCodes.empty()) {
 		std::set<std::string> codes;
 		codes.insert("zh");
-		shared_ptr<ZLDir> dir = patternsDirectory();
+		shared_ptr<ZLDir> dir = ZLFile(patternsDirectoryPath()).directory(false);
 		if (!dir.isNull()) {
 			std::vector<std::string> fileNames;
 			dir->collectFiles(fileNames, false);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageList.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageList.h
--- fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageList.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageList.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,11 +27,10 @@
 class ZLLanguageList {
 
 public:
+	static std::string patternsDirectoryPath();
 	static const std::vector<std::string> &languageCodes();
 	static std::string languageName(const std::string &code);
 
-	static shared_ptr<ZLDir> patternsDirectory();
-
 private:
 	static std::vector<std::string> ourLanguageCodes;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageMatcher.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageMatcher.cpp
--- fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageMatcher.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageMatcher.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -85,12 +85,15 @@
 }
 
 void ZLChineseMatcher::reset() {
+	myNeutralCharacterCounter = 1;
 	myChineseCharacterCounter = 1;
 	myNonChineseCharacterCounter = 1;
 }
 
 int ZLChineseMatcher::criterion() const {
-	return (myChineseCharacterCounter * 2000) / (myChineseCharacterCounter + myNonChineseCharacterCounter) - 1000;
+	return
+		2000 * (myChineseCharacterCounter + myNeutralCharacterCounter) /
+		(myChineseCharacterCounter + myNonChineseCharacterCounter + 2 * myNeutralCharacterCounter) - 1000;
 }
 
 ZLChineseUtf8Matcher::ZLChineseUtf8Matcher() : ZLWordBasedMatcher(new ZLLanguageDetector::LanguageInfo("zh", UTF8_ENCODING_NAME)) {
@@ -98,12 +101,15 @@
 }
 
 void ZLChineseUtf8Matcher::reset() {
+	myNeutralCharacterCounter = 1;
 	myChineseCharacterCounter = 1;
 	myNonChineseCharacterCounter = 1;
 }
 
 int ZLChineseUtf8Matcher::criterion() const {
-	return (myChineseCharacterCounter * 2000) / (myChineseCharacterCounter + myNonChineseCharacterCounter) - 1000;
+	return
+		2000 * (myChineseCharacterCounter + myNeutralCharacterCounter) /
+		(myChineseCharacterCounter + myNonChineseCharacterCounter + 2 * myNeutralCharacterCounter) - 1000;
 }
 
 void ZLChineseUtf8Matcher::processWord(const std::string &word, int length) {
@@ -127,17 +133,21 @@
 	};
 
 	const char *ptr = word.data();
-	ZLUnicodeUtil::Ucs2Char symbol;
+	ZLUnicodeUtil::Ucs4Char symbol;
 	for (int i = 0; i < length; ++i) {
 		ptr += ZLUnicodeUtil::firstChar(symbol, ptr);
 		if (symbol <= 0xFF) {
-			if (!ignorableSymbols[symbol]) {
+			if (ignorableSymbols[symbol]) {
+				++myNeutralCharacterCounter;
+			} else {
 				++myNonChineseCharacterCounter;
 			}
-		} else if (symbol >= 0x2000) {
+		} else if (symbol >= 0x3000) {
 			++myChineseCharacterCounter;
-		} else {
+		} else if (symbol < 0x2000) {
 			++myNonChineseCharacterCounter;
+		} else {
+			++myNeutralCharacterCounter;
 		}
 	}
 }
@@ -148,6 +158,7 @@
 void ZLChineseBig5Matcher::processBuffer(const unsigned char *ptr, const unsigned char *end) {
 	for (; ptr < end; ++ptr) {
 		if (*ptr <= 0x7F) {
+			++myNeutralCharacterCounter;
 			continue;
 		}
 		if ((*ptr <= 0xA0) || (*ptr >= 0xFA)) {
@@ -175,6 +186,7 @@
 void ZLChineseGBKMatcher::processBuffer(const unsigned char *ptr, const unsigned char *end) {
 	for (; ptr < end; ++ptr) {
 		if (*ptr <= 0x7F) {
+			++myNeutralCharacterCounter;
 			continue;
 		}
 		if ((*ptr == 0x80) || (*ptr == 0xFF)) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageMatcher.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageMatcher.h
--- fbreader-0.8.17/zlibrary/core/src/language/ZLLanguageMatcher.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/language/ZLLanguageMatcher.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,6 +78,7 @@
 	int criterion() const;
 
 private:
+	unsigned int myNeutralCharacterCounter;
 	unsigned int myChineseCharacterCounter;
 	unsigned int myNonChineseCharacterCounter;
 };
@@ -93,6 +94,7 @@
 	virtual void processBuffer(const unsigned char *start, const unsigned char *end) = 0;
 
 protected:
+	unsigned int myNeutralCharacterCounter;
 	unsigned int myChineseCharacterCounter;
 	unsigned int myNonChineseCharacterCounter;
 };
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/core/src/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,8 +26,11 @@
 #include "ZLibrary.h"
 #include "../filesystem/ZLFSManager.h"
 #include "../options/ZLConfig.h"
+#include "../network/ZLNetworkManager.h"
 
+bool ZLibrary::ourLocaleIsInitialized = false;
 std::string ZLibrary::ourLanguage;
+std::string ZLibrary::ourCountry;
 std::string ZLibrary::ourZLibraryDirectory;
 
 std::string ZLibrary::ourApplicationName;
@@ -42,7 +45,15 @@
 	while ((argc > 2) && (argv[1] != 0) && (argv[2] != 0)) {
 		static const std::string LANGUAGE_OPTION = "-lang";
 		if (LANGUAGE_OPTION == argv[1]) {
-			ourLanguage = argv[2];
+			ourLocaleIsInitialized = true;
+			std::string locale = argv[2];
+			int index = locale.find('_');
+			if (index >= 0) {
+				ourLanguage = locale.substr(0, index);
+				ourCountry = locale.substr(index + 1);
+			} else {
+				ourLanguage = locale;
+			}
 		} else {
 			break;
 		}
@@ -53,6 +64,7 @@
 }
 
 void ZLibrary::shutdown() {
+	ZLNetworkManager::deleteInstance();
 	ZLImageManager::deleteInstance();
 	ZLCommunicationManager::deleteInstance();
 	ZLDialogManager::deleteInstance();
@@ -84,3 +96,24 @@
 	ourApplicationDirectory = BaseDirectory + FileNameDelimiter + ourApplicationName;
 	ourDefaultFilesPathPrefix = ourApplicationDirectory + FileNameDelimiter + "default" + FileNameDelimiter;
 }
+
+std::string ZLibrary::Language() {
+	if (ourLanguage.empty()) {
+		if (!ourLocaleIsInitialized) {
+			initLocale();
+			ourLocaleIsInitialized = true;
+		}
+	}
+	if (ourLanguage.empty()) {
+		ourLanguage = "en";
+	}
+	return ourLanguage;
+}
+
+std::string ZLibrary::Country() {
+	if (ourCountry.empty() && !ourLocaleIsInitialized) {
+		initLocale();
+		ourLocaleIsInitialized = true;
+	}
+	return ourCountry;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/library/ZLibrary.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/library/ZLibrary.h
--- fbreader-0.8.17/zlibrary/core/src/library/ZLibrary.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/library/ZLibrary.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +32,7 @@
 	static const std::string PathDelimiter;
 	static const std::string EndOfLine;
 	static std::string Language();
+	static std::string Country();
 
 	static const std::string BaseDirectory;
 	static const std::string &ZLibraryDirectory();
@@ -50,7 +51,12 @@
 	static void shutdown();
 
 private:
+	static void initLocale();
+
+private:
+	static bool ourLocaleIsInitialized;
 	static std::string ourLanguage;
+	static std::string ourCountry;
 	static std::string ourZLibraryDirectory;
 
 	static std::string ourImageDirectory;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/message/ZLMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/message/ZLMessage.cpp
--- fbreader-0.8.17/zlibrary/core/src/message/ZLMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/message/ZLMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/message/ZLMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/message/ZLMessage.h
--- fbreader-0.8.17/zlibrary/core/src/message/ZLMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/message/ZLMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkData.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkData.cpp
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkData.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkData.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLNetworkData.h"
+
+ZLNetworkData::ZLNetworkData(const std::string &url) : myURL(url) {
+	myHandle = curl_easy_init();
+	if (myHandle != 0) {
+		curl_easy_setopt(myHandle, CURLOPT_URL, myURL.c_str());
+	}
+}
+
+ZLNetworkData::~ZLNetworkData() {
+	if (myHandle != 0) {
+		curl_easy_cleanup(myHandle);
+	}
+}
+
+const std::string &ZLNetworkData::url() const {
+	return myURL;
+}
+
+CURL *ZLNetworkData::handle() {
+	return myHandle;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkData.h
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKDATA_H__
+#define __ZLNETWORKDATA_H__
+
+#include <curl/curl.h>
+
+#include <string>
+
+class ZLNetworkData {
+
+protected:
+	ZLNetworkData(const std::string &url);
+
+public:
+	virtual ~ZLNetworkData();
+	const std::string &url() const;
+	CURL *handle();
+
+private:
+	const std::string myURL;
+	CURL *myHandle;
+};
+
+#endif /* __ZLNETWORKDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkManager.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,242 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <map>
+#include <set>
+
+#include <ZLStringUtil.h>
+#include <ZLFile.h>
+#include <ZLOutputStream.h>
+#include <ZLResource.h>
+
+#include "ZLNetworkManager.h"
+#include "ZLNetworkUtil.h"
+
+ZLNetworkManager *ZLNetworkManager::ourInstance = 0;
+
+void ZLNetworkManager::deleteInstance() {
+	if (ourInstance != 0) {
+		delete ourInstance;
+	}
+}
+
+ZLNetworkManager &ZLNetworkManager::instance() {
+	if (ourInstance == 0) {
+		ourInstance = new ZLNetworkManager();
+	}
+	return *ourInstance;
+}
+
+ZLNetworkManager::ZLNetworkManager() {
+}
+
+static const std::string OPTIONS = "Options";
+
+ZLIntegerRangeOption &ZLNetworkManager::ConnectTimeoutOption() const {
+	if (myConnectTimeoutOption.isNull()) {
+		myConnectTimeoutOption = new ZLIntegerRangeOption(
+			ZLCategoryKey::NETWORK, OPTIONS, "ConnectTimeout", 1, 1000, 10
+		);
+	}
+	return *myConnectTimeoutOption;
+}
+
+ZLIntegerRangeOption &ZLNetworkManager::TimeoutOption() const {
+	if (myTimeoutOption.isNull()) {
+		myTimeoutOption = new ZLIntegerRangeOption(
+			ZLCategoryKey::NETWORK, OPTIONS, "Timeout", 1, 1000, 15
+		);
+	}
+	return *myTimeoutOption;
+}
+
+ZLBooleanOption &ZLNetworkManager::UseProxyOption() const {
+	if (myUseProxyOption.isNull()) {
+		myUseProxyOption = new ZLBooleanOption(
+			ZLCategoryKey::NETWORK, OPTIONS, "UseProxy", false
+		);
+	}
+	return *myUseProxyOption;
+}
+
+ZLStringOption &ZLNetworkManager::ProxyHostOption() const {
+	if (myProxyHostOption.isNull()) {
+		myProxyHostOption = new ZLStringOption(
+			ZLCategoryKey::NETWORK, OPTIONS, "ProxyHost", ""
+		);
+	}
+	return *myProxyHostOption;
+}
+
+ZLStringOption &ZLNetworkManager::ProxyPortOption() const {
+	if (myProxyPortOption.isNull()) {
+		myProxyPortOption = new ZLStringOption(
+			ZLCategoryKey::NETWORK, OPTIONS, "ProxyPort", "3128"
+		);
+	}
+	return *myProxyPortOption;
+}
+
+ZLNetworkManager::~ZLNetworkManager() {
+}
+
+bool ZLNetworkManager::connect() const {
+	return true;
+}
+
+void ZLNetworkManager::release() const {
+}
+
+bool ZLNetworkManager::providesProxyInfo() const {
+	return false;
+}
+
+bool ZLNetworkManager::useProxy() const {
+	return UseProxyOption().value();
+}
+
+std::string ZLNetworkManager::proxyHost() const {
+	return ProxyHostOption().value();
+}
+
+std::string ZLNetworkManager::proxyPort() const {
+	return ProxyPortOption().value();
+}
+
+void ZLNetworkManager::setStandardOptions(CURL *handle, const std::string &proxy) const {
+	if (useProxy()) {
+		curl_easy_setopt(handle, CURLOPT_PROXY, proxy.c_str());
+	}
+	curl_easy_setopt(handle, CURLOPT_TIMEOUT, TimeoutOption().value());
+	curl_easy_setopt(handle, CURLOPT_CONNECTTIMEOUT, ConnectTimeoutOption().value());
+}
+
+static size_t writeToStream(void *ptr, size_t size, size_t nmemb, void *data) {
+	((ZLOutputStream*)data)->write((const char*)ptr, size * nmemb);
+	return size * nmemb;
+}
+
+std::string ZLNetworkManager::downloadFile(const std::string &url, const std::string &fileName) const {
+	const ZLResource &errorResource = ZLResource::resource("dialog")["networkError"];
+
+	CURL *curl = curl_easy_init();
+	if (!curl) {
+		return errorResource["unknownErrorMessage"].value();
+	}
+	curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
+	const std::string proxy = proxyHost() + ':' + proxyPort();
+	setStandardOptions(curl, proxy);
+
+	ZLFile fileToWrite(fileName);
+	shared_ptr<ZLOutputStream> stream = fileToWrite.outputStream();
+	if (stream.isNull() || !stream->open()) {
+		return ZLStringUtil::printf(errorResource["couldntCreateFileMessage"].value(), fileName);
+	}
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeToStream);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, &*stream);
+
+	CURLcode res = curl_easy_perform(curl);
+	curl_easy_cleanup(curl);
+	stream->close();
+
+	if (res == CURLE_OK) {
+		return "";
+	}
+
+	fileToWrite.remove();
+
+	switch (res) {
+		default:
+			return ZLStringUtil::printf(errorResource["somethingWrongMessage"].value(), url);
+		case CURLE_COULDNT_RESOLVE_PROXY:
+			return ZLStringUtil::printf(errorResource["couldntResolveProxyMessage"].value(), proxyHost());
+		case CURLE_COULDNT_RESOLVE_HOST:
+			return ZLStringUtil::printf(errorResource["couldntResolveHostMessage"].value(), ZLNetworkUtil::hostFromUrl(url));
+		case CURLE_COULDNT_CONNECT:
+			return ZLStringUtil::printf(errorResource["couldntConnectMessage"].value(), ZLNetworkUtil::hostFromUrl(url));
+		case CURLE_OPERATION_TIMEDOUT:
+			return errorResource["operationTimedOutMessage"].value();
+	}
+}
+
+std::string ZLNetworkManager::perform(const std::vector<shared_ptr<ZLNetworkData> > &dataList) const {
+	const ZLResource &errorResource = ZLResource::resource("dialog")["networkError"];
+
+	if (dataList.empty()) {
+		return errorResource["emptyLibrariesList"].value();
+	}
+
+	const std::string proxy = proxyHost() + ':' + proxyPort();
+	CURLM *handle = curl_multi_init();
+	std::map<CURL*,shared_ptr<ZLNetworkData> > handleToData; 
+	for (std::vector<shared_ptr<ZLNetworkData> >::const_iterator it = dataList.begin(); it != dataList.end(); ++it) {
+		CURL *easyHandle = (*it)->handle();
+		if (easyHandle != 0) {
+			handleToData[easyHandle] = *it;
+			setStandardOptions(easyHandle, proxy);
+			curl_multi_add_handle(handle, easyHandle);
+		}
+	}
+
+	int counter;
+	CURLMcode res;
+	do {
+		res = curl_multi_perform(handle, &counter);
+	} while ((res == CURLM_CALL_MULTI_PERFORM) || (counter > 0));
+
+	CURLMsg *message;
+	std::set<std::string> errors;
+	do {
+		int queueSize;
+		message = curl_multi_info_read(handle, &queueSize);
+		if ((message != 0) &&
+		    (message->msg == CURLMSG_DONE) &&
+		    (message->data.result != CURLE_OK)) {
+			const std::string &url = handleToData[message->easy_handle]->url();
+			switch (message->data.result) {
+				default:
+					errors.insert(ZLStringUtil::printf(errorResource["somethingWrongMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
+					break;
+				case CURLE_COULDNT_RESOLVE_PROXY:
+					errors.insert(ZLStringUtil::printf(errorResource["couldntResolveProxyMessage"].value(), proxyHost()));
+					break;
+				case CURLE_COULDNT_RESOLVE_HOST:
+					errors.insert(ZLStringUtil::printf(errorResource["couldntResolveHostMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
+					break;
+				case CURLE_COULDNT_CONNECT:
+					errors.insert(ZLStringUtil::printf(errorResource["couldntConnectMessage"].value(), ZLNetworkUtil::hostFromUrl(url)));
+					break;
+				case CURLE_OPERATION_TIMEDOUT:
+					errors.insert(errorResource["operationTimedOutMessage"].value());
+					break;
+			}
+		}
+	} while ((message != 0) && (errors.size() < 3));
+
+	curl_multi_cleanup(handle);
+
+	std::string result;
+	for (std::set<std::string>::const_iterator et = errors.begin(); et != errors.end(); ++et) {
+		if (!result.empty()) {
+			result += '\n';
+		}
+		result += *et;
+	}
+	return result;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkManager.h
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkManager.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKMANAGER_H__
+#define __ZLNETWORKMANAGER_H__
+
+#include <string>
+#include <vector>
+
+#include <shared_ptr.h>
+#include <ZLOptions.h>
+#include <ZLNetworkData.h>
+
+class ZLNetworkManager {
+
+public:
+	static void deleteInstance();
+	static ZLNetworkManager &instance();
+
+protected:
+	static ZLNetworkManager *ourInstance;
+	
+public:
+	ZLIntegerRangeOption &ConnectTimeoutOption() const;
+	ZLIntegerRangeOption &TimeoutOption() const;
+	ZLBooleanOption &UseProxyOption() const;
+	ZLStringOption &ProxyHostOption() const;
+	ZLStringOption &ProxyPortOption() const;
+
+protected:
+	ZLNetworkManager();
+	virtual ~ZLNetworkManager();
+
+public:
+	virtual bool connect() const;
+	virtual void release() const;
+
+	virtual bool providesProxyInfo() const;
+
+protected:
+	virtual bool useProxy() const;
+	virtual std::string proxyHost() const;
+	virtual std::string proxyPort() const;
+
+public:
+	// returns error message
+	std::string downloadFile(const std::string &url, const std::string &fileName) const;
+	// returns error message
+	std::string perform(const std::vector<shared_ptr<ZLNetworkData> > &dataList) const;
+
+private:
+	void setStandardOptions(CURL *handle, const std::string &proxy) const;
+
+	mutable shared_ptr<ZLIntegerRangeOption> myConnectTimeoutOption;
+	mutable shared_ptr<ZLIntegerRangeOption> myTimeoutOption;
+	mutable shared_ptr<ZLBooleanOption> myUseProxyOption;
+	mutable shared_ptr<ZLStringOption> myProxyHostOption;
+	mutable shared_ptr<ZLStringOption> myProxyPortOption;
+};
+
+#endif /* __ZLNETWORKMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkUtil.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <map>
+#include <set>
+
+#include <ZLUnicodeUtil.h>
+
+#include "ZLNetworkUtil.h"
+
+std::string ZLNetworkUtil::hostFromUrl(const std::string &url) {
+	std::string host = url;
+	int index = host.find("://");
+	if (index != -1) {
+		host.erase(0, index + 3);
+	}
+	index = host.find("/");
+	if (index != -1) {
+		host.erase(index);
+	}
+	return host;
+}
+
+std::string ZLNetworkUtil::htmlEncode(const std::string &stringToEncode) {
+	std::string encodedString;
+	const char *data = stringToEncode.data();
+	const char *end = data + stringToEncode.length();
+	while (data < end) {
+		ZLUnicodeUtil::Ucs4Char ch;
+		int count = ZLUnicodeUtil::firstChar(ch, data);
+		if (ZLUnicodeUtil::isLetter(ch) ||
+				(ch == '.') ||
+				(ch == '~') ||
+				(ch == '-') ||
+				(ch == '_')) {
+			encodedString.append(data, count);
+		} else {
+			static const char hexDigits[] = "0123456789ABCDEF";
+			for (int i = 0; i < count; ++i) {
+				encodedString += '%';
+				encodedString += hexDigits[((unsigned char)data[i]) / 16];
+				encodedString += hexDigits[((unsigned char)data[i]) % 16];
+			}
+		}
+		data += count;
+	}
+	return encodedString;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkUtil.h
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkUtil.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKUTIL_H__
+#define __ZLNETWORKUTIL_H__
+
+#include <string>
+
+class ZLNetworkUtil {
+
+public:
+	static std::string htmlEncode(const std::string &stringToEncode);
+	static std::string hostFromUrl(const std::string &url);
+
+private:
+	ZLNetworkUtil();
+};
+
+#endif /* __ZLNETWORKUTIL_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkXMLParserData.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkXMLParserData.cpp
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkXMLParserData.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkXMLParserData.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLXMLReader.h>
+
+#include "ZLNetworkXMLParserData.h"
+
+static size_t parseXML(void *ptr, size_t size, size_t nmemb, void *data) {
+	((ZLXMLReader*)data)->readFromBuffer((const char*)ptr, size * nmemb);
+	return size * nmemb;
+}
+
+ZLNetworkXMLParserData::ZLNetworkXMLParserData(const std::string &url, shared_ptr<ZLXMLReader> reader) : ZLNetworkData(url), myReader(reader) {
+	CURL *h = handle();
+	if (h != 0) {
+		curl_easy_setopt(h, CURLOPT_WRITEFUNCTION, parseXML);
+		curl_easy_setopt(h, CURLOPT_WRITEDATA, &*myReader);
+		myReader->initialize();
+	}
+}
+
+ZLNetworkXMLParserData::~ZLNetworkXMLParserData() {
+	if (handle() != 0) {
+		myReader->shutdown();
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkXMLParserData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkXMLParserData.h
--- fbreader-0.8.17/zlibrary/core/src/network/ZLNetworkXMLParserData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/network/ZLNetworkXMLParserData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLNETWORKXMLPARSERDATA_H__
+#define __ZLNETWORKXMLPARSERDATA_H__
+
+#include <shared_ptr.h>
+
+#include "ZLNetworkData.h"
+
+class ZLXMLReader;
+
+class ZLNetworkXMLParserData : public ZLNetworkData {
+
+public:
+	ZLNetworkXMLParserData(const std::string &url, shared_ptr<ZLXMLReader> reader);
+	~ZLNetworkXMLParserData();
+
+private:
+	shared_ptr<ZLXMLReader> myReader;
+};
+
+#endif /* __ZLNETWORKXMLPARSERDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLColorOptionBuilder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLFontFamilyOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLLanguageOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleKeyOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLSimpleOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLStringInfoEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLStringInfoEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLStringInfoEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLStringInfoEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLStringInfoEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLStringInfoEntry.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLStringInfoEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLStringInfoEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.cpp
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.h
--- fbreader-0.8.17/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/optionEntries/ZLToggleBooleanOptionEntry.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/options/ZLCategoryKey.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLCategoryKey.cpp
--- fbreader-0.8.17/zlibrary/core/src/options/ZLCategoryKey.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLCategoryKey.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,7 @@
 const ZLCategoryKey ZLCategoryKey::CONFIG("options");
 const ZLCategoryKey ZLCategoryKey::STATE("state");
 const ZLCategoryKey ZLCategoryKey::SYSTEM("system");
+const ZLCategoryKey ZLCategoryKey::NETWORK("network");
 
 ZLCategoryKey::ZLCategoryKey(const std::string &name) : Name(name) {
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/options/ZLConfig.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLConfig.cpp
--- fbreader-0.8.17/zlibrary/core/src/options/ZLConfig.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLConfig.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/options/ZLConfig.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLConfig.h
--- fbreader-0.8.17/zlibrary/core/src/options/ZLConfig.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLConfig.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/options/ZLOptions.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLOptions.cpp
--- fbreader-0.8.17/zlibrary/core/src/options/ZLOptions.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLOptions.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/options/ZLOptions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLOptions.h
--- fbreader-0.8.17/zlibrary/core/src/options/ZLOptions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/options/ZLOptions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
 	static const ZLCategoryKey CONFIG;
 	static const ZLCategoryKey STATE;
 	static const ZLCategoryKey SYSTEM;
+	static const ZLCategoryKey NETWORK;
 
 protected:
 	explicit ZLCategoryKey(const std::string &name);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include "ZLPosixFileInputStream.h"
-
-ZLPosixFileInputStream::ZLPosixFileInputStream(const std::string &name) : myName(name) {
-	myFile = 0;
-}
-
-ZLPosixFileInputStream::~ZLPosixFileInputStream() {
-	close();
-}
-
-bool ZLPosixFileInputStream::open() {
-	close();
-	myFile = fopen(myName.c_str(), "rb");
-	return myFile != 0;
-}
-
-size_t ZLPosixFileInputStream::read(char *buffer, size_t maxSize) {
-	if (buffer != 0) {
-		return fread(buffer, 1, maxSize, myFile);
-	} else {
-		int pos = ftell(myFile);
-		fseek(myFile, maxSize, SEEK_CUR);
-		return ftell(myFile) - pos;
-	}
-}
-
-void ZLPosixFileInputStream::close() {
-	if (myFile != 0) {
-		fclose(myFile);
-		myFile = 0;
-	}
-}
-
-size_t ZLPosixFileInputStream::sizeOfOpened() {
-	if (myFile == 0) {
-		return 0;
-	}
-	long pos = ftell(myFile);
-	fseek(myFile, 0, SEEK_END);
-	long size = ftell(myFile);
-	fseek(myFile, pos, SEEK_SET);
-	return size;
-}
-
-void ZLPosixFileInputStream::seek(int offset, bool absoluteOffset) {
-	fseek(myFile, offset, absoluteOffset ? SEEK_SET : SEEK_CUR);
-}
-
-size_t ZLPosixFileInputStream::offset() const {
-	return ftell(myFile);
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.h
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileInputStream.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __ZLPOSIXFILEINPUTSTREAM_H__
-#define __ZLPOSIXFILEINPUTSTREAM_H__
-
-#include <stdio.h>
-
-#include <ZLInputStream.h>
-
-class ZLPosixFileInputStream : public ZLInputStream {
-
-public:
-	ZLPosixFileInputStream(const std::string &name);
-	~ZLPosixFileInputStream();
-	bool open();
-	size_t read(char *buffer, size_t maxSize);
-	void close();
-
-	void seek(int offset, bool absoluteOffset);
-	size_t offset() const;
-	size_t sizeOfOpened();
-
-private:
-	std::string myName;
-	FILE *myFile;
-};
-
-#endif /* __ZLPOSIXFILEINPUTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-
-#include "ZLPosixFileOutputStream.h"
-#include "ZLPosixFSManager.h"
-
-ZLPosixFileOutputStream::ZLPosixFileOutputStream(const std::string &name) : myName(name), myHasErrors(false), myFile(0) {
-}
-
-ZLPosixFileOutputStream::~ZLPosixFileOutputStream() {
-	close();
-}
-
-bool ZLPosixFileOutputStream::open() {
-	close();
-
-	myTemporaryName = myName + ".XXXXXX" + '\0';
-	if (::mktemp((char*)myTemporaryName.data()) == 0) {
-		return false;
-	}
-
-	myFile = fopen(myTemporaryName.c_str(), "wb");
-	return myFile != 0;
-}
-
-void ZLPosixFileOutputStream::write(const std::string &str) {
-	if (::fwrite(str.data(), 1, str.length(), myFile) != (size_t)str.length()) {
-		myHasErrors = true;
-	}
-}
-
-void ZLPosixFileOutputStream::close() {
-	if (myFile != 0) {
-		::fclose(myFile);
-		myFile = 0;
-		if (!myHasErrors) {
-			((ZLPosixFSManager&)ZLFSManager::instance()).moveFile(myTemporaryName, myName);
-		}
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.h
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFileOutputStream.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __ZLPOSIXFILEOUTPUTSTREAM_H__
-#define __ZLPOSIXFILEOUTPUTSTREAM_H__
-
-#include <stdio.h>
-
-#include <ZLOutputStream.h>
-
-class ZLPosixFileOutputStream : public ZLOutputStream {
-
-public:
-	ZLPosixFileOutputStream(const std::string &name);
-	~ZLPosixFileOutputStream();
-	bool open();
-	void write(const std::string &str);
-	void close();
-
-private:
-	std::string myName;
-	std::string myTemporaryName;
-	bool myHasErrors;
-	FILE *myFile;
-	//int myFileDescriptor;
-};
-
-#endif /* __ZLPOSIXFILEOUTPUTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.cpp
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <dirent.h>
-#include <stdio.h>
-
-#include "ZLPosixFSDir.h"
-#include "ZLPosixFSManager.h"
-
-void ZLPosixFSDir::collectSubDirs(std::vector<std::string> &names, bool includeSymlinks) {
-	DIR *dir = opendir(path().c_str());
-	if (dir != 0) {
-		const std::string namePrefix = path() + delimiter();
-		const dirent *file;
-		struct stat fileInfo;
-		std::string shortName;
-		while ((file = readdir(dir)) != 0) {
-			shortName = file->d_name;
-			if ((shortName == ".") || (shortName == "..")) {
-				continue;
-			}
-			((ZLPosixFSManager&)ZLFSManager::instance()).getStat(namePrefix + shortName, includeSymlinks, fileInfo);
-			if (S_ISDIR(fileInfo.st_mode)) {
-				names.push_back(shortName);
-			}
-		}
-		closedir(dir);
-	}
-}
-
-void ZLPosixFSDir::collectFiles(std::vector<std::string> &names, bool includeSymlinks) {
-	DIR *dir = opendir(path().c_str());
-	if (dir != 0) {
-		const std::string namePrefix = path() + delimiter();
-		const dirent *file;
-		struct stat fileInfo;
-		std::string shortName;
-		while ((file = readdir(dir)) != 0) {
-			shortName = file->d_name;
-			if ((shortName == ".") || (shortName == "..")) {
-				continue;
-			}
-			((ZLPosixFSManager&)ZLFSManager::instance()).getStat(namePrefix + shortName, includeSymlinks, fileInfo);
-			if (S_ISREG(fileInfo.st_mode)) {
-				names.push_back(shortName);
-			}
-		}
-		closedir(dir);
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.h
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSDir.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __ZLPOSIXFSDIR_H__
-#define __ZLPOSIXFSDIR_H__
-
-#include "../../filesystem/ZLFSDir.h"
-
-#include <sys/stat.h>
-
-class ZLPosixFSDir : public ZLFSDir {
-
-public:
-	ZLPosixFSDir(const std::string &name) : ZLFSDir(name) {}
-
-	void collectSubDirs(std::vector<std::string> &names, bool includeSymlinks);
-	void collectFiles(std::vector<std::string> &names, bool includeSymlinks);
-};
-
-#endif /* __ZLPOSIXFSDIR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <ZLibrary.h>
-#include <ZLStringUtil.h>
-
-#include "ZLPosixFSManager.h"
-#include "ZLPosixFSDir.h"
-#include "ZLPosixFileInputStream.h"
-#include "ZLPosixFileOutputStream.h"
-
-ZLFSDir *ZLPosixFSManager::createPlainDirectory(const std::string &path) const {
-	return new ZLPosixFSDir(path);
-}
-
-ZLInputStream *ZLPosixFSManager::createPlainInputStream(const std::string &path) const {
-	return new ZLPosixFileInputStream(path);
-}
-
-ZLOutputStream *ZLPosixFSManager::createOutputStream(const std::string &path) const {
-	return new ZLPosixFileOutputStream(path);
-}
-
-ZLFileInfo ZLPosixFSManager::fileInfo(const std::string &path) const {
-	ZLFileInfo info;
-	struct stat fileStat;
-	info.Exists = stat(path.c_str(), &fileStat) == 0;
-	if (info.Exists) {
-		info.Size = fileStat.st_size;
-		info.MTime = fileStat.st_mtime;
-		info.IsDirectory = S_ISDIR(fileStat.st_mode);
-	}
-	return info;
-}
-
-bool ZLPosixFSManager::removeFile(const std::string &path) const {
-	return unlink(path.c_str()) == 0;
-}
-
-int ZLPosixFSManager::findLastFileNameDelimiter(const std::string &path) const {
-	int index = findArchiveFileNameDelimiter(path);
-	if (index == -1) {
-		index = path.rfind(ZLibrary::FileNameDelimiter);
-	}
-	return index;
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.h
--- fbreader-0.8.17/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/posix/filesystem/ZLPosixFSManager.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __ZLPOSIXFSMANAGER_H__
-#define __ZLPOSIXFSMANAGER_H__
-
-#include "../../filesystem/ZLFSManager.h"
-
-class ZLPosixFSManager : public ZLFSManager {
-
-protected:
-	ZLFSDir *createPlainDirectory(const std::string &path) const;
-	ZLInputStream *createPlainInputStream(const std::string &path) const;
-	ZLOutputStream *createOutputStream(const std::string &path) const;
-	ZLFileInfo fileInfo(const std::string &path) const;
-	bool removeFile(const std::string &path) const;
-
-	int findLastFileNameDelimiter(const std::string &path) const;
-
-public:
-	virtual void moveFile(const std::string &oldName, const std::string &newName) = 0;
-	virtual void getStat(const std::string &path, bool includeSymlinks, struct stat &fileInfo) const = 0;
-};
-
-#endif /* __ZLPOSIXFSMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/resources/ZLResource.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/resources/ZLResource.cpp
--- fbreader-0.8.17/zlibrary/core/src/resources/ZLResource.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/resources/ZLResource.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -132,6 +132,10 @@
 		if (language != "en") {
 			loadData(language);
 		}
+		const std::string country = ZLibrary::Country();
+		if (!country.empty()) {
+			loadData(language + '_' + country);
+		}
 	}
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/resources/ZLResource.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/resources/ZLResource.h
--- fbreader-0.8.17/zlibrary/core/src/resources/ZLResource.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/resources/ZLResource.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/runnable/ZLRunnable.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/runnable/ZLRunnable.h
--- fbreader-0.8.17/zlibrary/core/src/runnable/ZLRunnable.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/runnable/ZLRunnable.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/splittedView/ZLPartialPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLPartialPaintContext.cpp
--- fbreader-0.8.17/zlibrary/core/src/splittedView/ZLPartialPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLPartialPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,8 +49,8 @@
 	return mySplittedView.context().height();
 }
 
-int ZLPartialPaintContext::stringWidth(const char *str, int len) const {
-	return mySplittedView.context().stringWidth(str, len);
+int ZLPartialPaintContext::stringWidth(const char *str, int len, bool rtl) const {
+	return mySplittedView.context().stringWidth(str, len, rtl);
 }
 
 int ZLPartialPaintContext::spaceWidth() const {
@@ -65,8 +65,8 @@
 	return mySplittedView.context().descent();
 }
 
-void ZLPartialPaintContext::drawString(int x, int y, const char *str, int len) {
-	mySplittedView.context().drawString(x + xDelta(), y, str, len);
+void ZLPartialPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
+	mySplittedView.context().drawString(x + xDelta(), y, str, len, rtl);
 }
 
 void ZLPartialPaintContext::drawImage(int x, int y, const ZLImageData &image) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/splittedView/ZLPartialPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLPartialPaintContext.h
--- fbreader-0.8.17/zlibrary/core/src/splittedView/ZLPartialPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLPartialPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,11 +38,11 @@
 	int width() const;
 	int height() const;
 	
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/splittedView/ZLSplittedView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLSplittedView.cpp
--- fbreader-0.8.17/zlibrary/core/src/splittedView/ZLSplittedView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLSplittedView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/splittedView/ZLSplittedView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLSplittedView.h
--- fbreader-0.8.17/zlibrary/core/src/splittedView/ZLSplittedView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/splittedView/ZLSplittedView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #ifndef __ZLSPLITTEDVIEW_H__
 #define __ZLSPLITTEDVIEW_H__
 
+#include <ZLColor.h>
 #include <ZLView.h>
 
 class ZLSplittedView : public ZLView {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/time/ZLTime.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/time/ZLTime.cpp
--- fbreader-0.8.17/zlibrary/core/src/time/ZLTime.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/time/ZLTime.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/time/ZLTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/time/ZLTime.h
--- fbreader-0.8.17/zlibrary/core/src/time/ZLTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/time/ZLTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLUnixFileInputStream.h"
+
+ZLUnixFileInputStream::ZLUnixFileInputStream(const std::string &name) : myName(name), myNeedRepositionToStart(false) {
+	myFile = 0;
+}
+
+ZLUnixFileInputStream::~ZLUnixFileInputStream() {
+	//close();
+	if (myFile != 0) {
+		fclose(myFile);
+	}
+}
+
+bool ZLUnixFileInputStream::open() {
+	//close();
+	if (myFile == 0) {
+		myFile = fopen(myName.c_str(), "rb");
+	} else {
+		//fseek(myFile, 0, SEEK_SET);
+		myNeedRepositionToStart = true;
+	}
+	return myFile != 0;
+}
+
+size_t ZLUnixFileInputStream::read(char *buffer, size_t maxSize) {
+	if (buffer != 0) {
+		if (myNeedRepositionToStart) {
+			fseek(myFile, 0, SEEK_SET);
+			myNeedRepositionToStart = false;
+		}
+		return fread(buffer, 1, maxSize, myFile);
+	} else {
+		if (myNeedRepositionToStart) {
+			fseek(myFile, maxSize, SEEK_SET);
+			myNeedRepositionToStart = false;
+			return ftell(myFile);
+		} else {
+			int pos = ftell(myFile);
+			fseek(myFile, maxSize, SEEK_CUR);
+			return ftell(myFile) - pos;
+		}
+	}
+}
+
+void ZLUnixFileInputStream::close() {
+	//if (myFile != 0) {
+	//	fclose(myFile);
+	//	myFile = 0;
+	//}
+}
+
+size_t ZLUnixFileInputStream::sizeOfOpened() {
+	if (myFile == 0) {
+		return 0;
+	}
+	long pos = ftell(myFile);
+	fseek(myFile, 0, SEEK_END);
+	long size = ftell(myFile);
+	fseek(myFile, pos, SEEK_SET);
+	return size;
+}
+
+void ZLUnixFileInputStream::seek(int offset, bool absoluteOffset) {
+	if (myNeedRepositionToStart) {
+		absoluteOffset = true;
+		myNeedRepositionToStart = false;
+	}
+	fseek(myFile, offset, absoluteOffset ? SEEK_SET : SEEK_CUR);
+}
+
+size_t ZLUnixFileInputStream::offset() const {
+	return myNeedRepositionToStart ? 0 : ftell(myFile);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.h
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileInputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLUNIXFILEINPUTSTREAM_H__
+#define __ZLUNIXFILEINPUTSTREAM_H__
+
+#include <stdio.h>
+
+#include <ZLInputStream.h>
+
+class ZLUnixFileInputStream : public ZLInputStream {
+
+public:
+	ZLUnixFileInputStream(const std::string &name);
+	~ZLUnixFileInputStream();
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	std::string myName;
+	FILE *myFile;
+	bool myNeedRepositionToStart;
+};
+
+#endif /* __ZLUNIXFILEINPUTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+
+#include "ZLUnixFileOutputStream.h"
+#include "ZLUnixFSManager.h"
+
+ZLUnixFileOutputStream::ZLUnixFileOutputStream(const std::string &name) : myName(name), myHasErrors(false), myFile(0) {
+}
+
+ZLUnixFileOutputStream::~ZLUnixFileOutputStream() {
+	close();
+}
+
+bool ZLUnixFileOutputStream::open() {
+	close();
+
+	myTemporaryName = myName + ".XXXXXX" + '\0';
+	if (::mktemp((char*)myTemporaryName.data()) == 0) {
+		return false;
+	}
+
+	myFile = fopen(myTemporaryName.c_str(), "wb");
+	return myFile != 0;
+}
+
+void ZLUnixFileOutputStream::write(const char *data, size_t len) {
+	if (::fwrite(data, 1, len, myFile) != len) {
+		myHasErrors = true;
+	}
+}
+
+void ZLUnixFileOutputStream::write(const std::string &str) {
+	if (::fwrite(str.data(), 1, str.length(), myFile) != (size_t)str.length()) {
+		myHasErrors = true;
+	}
+}
+
+void ZLUnixFileOutputStream::close() {
+	if (myFile != 0) {
+		::fclose(myFile);
+		myFile = 0;
+		if (!myHasErrors) {
+			rename(myTemporaryName.c_str(), myName.c_str());
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.h
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFileOutputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLUNIXFILEOUTPUTSTREAM_H__
+#define __ZLUNIXFILEOUTPUTSTREAM_H__
+
+#include <stdio.h>
+
+#include <ZLOutputStream.h>
+
+class ZLUnixFileOutputStream : public ZLOutputStream {
+
+public:
+	ZLUnixFileOutputStream(const std::string &name);
+	~ZLUnixFileOutputStream();
+	bool open();
+	void write(const char *data, size_t len);
+	void write(const std::string &str);
+	void close();
+
+private:
+	std::string myName;
+	std::string myTemporaryName;
+	bool myHasErrors;
+	FILE *myFile;
+};
+
+#endif /* __ZLUNIXFILEOUTPUTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <sys/stat.h>
+#include <dirent.h>
+#include <stdio.h>
+
+#include "ZLUnixFSDir.h"
+#include "ZLUnixFSManager.h"
+
+void ZLUnixFSDir::collectSubDirs(std::vector<std::string> &names, bool includeSymlinks) {
+	DIR *dir = opendir(path().c_str());
+	if (dir != 0) {
+		const std::string namePrefix = path() + delimiter();
+		const dirent *file;
+		struct stat fileInfo;
+		std::string shortName;
+		while ((file = readdir(dir)) != 0) {
+			shortName = file->d_name;
+			if ((shortName == ".") || (shortName == "..")) {
+				continue;
+			}
+			const std::string path = namePrefix + shortName;
+			if (includeSymlinks) {
+				stat(path.c_str(), &fileInfo);
+			} else {
+				lstat(path.c_str(), &fileInfo);
+			}
+			if (S_ISDIR(fileInfo.st_mode)) {
+				names.push_back(shortName);
+			}
+		}
+		closedir(dir);
+	}
+}
+
+void ZLUnixFSDir::collectFiles(std::vector<std::string> &names, bool includeSymlinks) {
+	DIR *dir = opendir(path().c_str());
+	if (dir != 0) {
+		const std::string namePrefix = path() + delimiter();
+		const dirent *file;
+		struct stat fileInfo;
+		std::string shortName;
+		while ((file = readdir(dir)) != 0) {
+			shortName = file->d_name;
+			if ((shortName == ".") || (shortName == "..")) {
+				continue;
+			}
+			const std::string path = namePrefix + shortName;
+			if (includeSymlinks) {
+				stat(path.c_str(), &fileInfo);
+			} else {
+				lstat(path.c_str(), &fileInfo);
+			}
+			if (S_ISREG(fileInfo.st_mode)) {
+				names.push_back(shortName);
+			}
+		}
+		closedir(dir);
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.h
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSDir.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLUNIXFSDIR_H__
+#define __ZLUNIXFSDIR_H__
+
+#include "../../filesystem/ZLFSDir.h"
+
+class ZLUnixFSDir : public ZLFSDir {
+
+public:
+	ZLUnixFSDir(const std::string &name) : ZLFSDir(name) {}
+
+	void collectSubDirs(std::vector<std::string> &names, bool includeSymlinks);
+	void collectFiles(std::vector<std::string> &names, bool includeSymlinks);
+};
+
+#endif /* __ZLUNIXFSDIR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <set>
+
 #include <ZLStringUtil.h>
 
 #include "ZLUnixFSManager.h"
-#include "../../filesystem/ZLFSDir.h"
+#include "ZLUnixFSDir.h"
+#include "ZLUnixFileInputStream.h"
+#include "ZLUnixFileOutputStream.h"
 
 static std::string getPwdDir() {
 	char *pwd = getenv("PWD");
@@ -37,6 +41,42 @@
 	return (home != 0) ? home : "";
 }
 
+ZLFileInfo ZLUnixFSManager::fileInfo(const std::string &path) const {
+	ZLFileInfo info;
+	struct stat fileStat;
+	info.Exists = stat(path.c_str(), &fileStat) == 0;
+	if (info.Exists) {
+		info.Size = fileStat.st_size;
+		info.IsDirectory = S_ISDIR(fileStat.st_mode);
+	}
+	return info;
+}
+
+std::string ZLUnixFSManager::resolveSymlink(const std::string &path) const {
+	struct stat fileStat;
+	std::set<std::string> names;
+	std::string current = path;
+	for (int i = 0; i < 256; ++i) {
+		names.insert(current);
+
+		std::string buffer(2048, '\0');
+		int len = readlink(current.c_str(), (char*)buffer.data(), 2048);
+		if ((len == 2048) || (len <= 0)) {
+			return current;
+		}
+		buffer.erase(len);
+		if (buffer[0] != '/') {
+			buffer = parentPath(current) + '/' + buffer;
+		}
+		normalize(buffer);
+		if (names.find(buffer) != names.end()) {
+			return buffer;
+		}
+		current = buffer;
+	}
+	return "";
+}
+
 void ZLUnixFSManager::normalize(std::string &path) const {
 	static std::string HomeDir = getHomeDir();
 	static std::string PwdDir = getPwdDir();
@@ -63,21 +103,66 @@
 		int prevIndex = std::max((int)path.rfind('/', index - 1), 0);
 		path.erase(prevIndex, index + 3 - prevIndex);
 	}
-	const int len = path.length();
+	int len = path.length();
 	if ((len >= 3) && (path.substr(len - 3) == "/..")) {
 		int prevIndex = std::max((int)path.rfind('/', len - 4), 0);
-		path.erase(prevIndex, len - prevIndex);
+		path.erase(prevIndex);
 	}
 	while ((index = path.find("/./")) != -1) {
 		path.erase(index, 2);
 	}
+	len = path.length();
+	if ((len >= 2) && (path.substr(len - 2) == "/.")) {
+		path.erase(len - 2);
+	}
 	while ((index = path.find("//")) != -1) {
 		path.erase(index, 1);
 	}
 }
 
 ZLFSDir *ZLUnixFSManager::createNewDirectory(const std::string &path) const {
-	return (mkdir(path.c_str(), 0x1FF) == 0) ? createPlainDirectory(path) : 0;
+	std::vector<std::string> subpaths;
+	std::string current = path;
+
+	while (current.length() > 1) {
+		struct stat fileStat;
+		if (stat(current.c_str(), &fileStat) == 0) {
+			if (!S_ISDIR(fileStat.st_mode)) {
+				return 0;
+			}
+			break;
+		} else {
+			subpaths.push_back(current);
+			int index = current.rfind('/');
+			if (index == -1) {
+				return 0;
+			}
+			current.erase(index);
+		}
+	}
+
+	for (int i = subpaths.size() - 1; i >= 0; --i) {
+		if (mkdir(subpaths[i].c_str(), 0x1FF) != 0) {
+			return 0;
+		}
+	}
+	return createPlainDirectory(path);
+}
+
+ZLFSDir *ZLUnixFSManager::createPlainDirectory(const std::string &path) const {
+	return new ZLUnixFSDir(path);
+}
+
+ZLInputStream *ZLUnixFSManager::createPlainInputStream(const std::string &path) const {
+	return new ZLUnixFileInputStream(path);
+}
+
+ZLOutputStream *ZLUnixFSManager::createOutputStream(const std::string &path) const {
+	return new ZLUnixFileOutputStream(path);
+}
+
+bool ZLUnixFSManager::removeFile(const std::string &path) const {
+	return unlink(path.c_str()) == 0;
 }
 
 int ZLUnixFSManager::findArchiveFileNameDelimiter(const std::string &path) const {
@@ -101,15 +186,3 @@
 	int index = findLastFileNameDelimiter(path);
 	return (index <= 0) ? RootPath : path.substr(0, index);
 }
-
-void ZLUnixFSManager::moveFile(const std::string &oldName, const std::string &newName) {
-	rename(oldName.c_str(), newName.c_str());
-}
-
-void ZLUnixFSManager::getStat(const std::string &path, bool includeSymlinks, struct stat &fileInfo) const {
-	if (includeSymlinks) {
-		stat(path.c_str(), &fileInfo);
-	} else {
-		lstat(path.c_str(), &fileInfo);
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.h
--- fbreader-0.8.17/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/filesystem/ZLUnixFSManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,21 +20,25 @@
 #ifndef __ZLUNIXFSMANAGER_H__
 #define __ZLUNIXFSMANAGER_H__
 
-#include "../../posix/filesystem/ZLPosixFSManager.h"
+#include "../../filesystem/ZLFSManager.h"
 
-class ZLUnixFSManager : public ZLPosixFSManager {
+class ZLUnixFSManager : public ZLFSManager {
 
-protected:
+private:
 	void normalize(std::string &path) const;
+	std::string resolveSymlink(const std::string &path) const;
 	ZLFSDir *createNewDirectory(const std::string &path) const;
+	ZLFSDir *createPlainDirectory(const std::string &path) const;
+	ZLInputStream *createPlainInputStream(const std::string &path) const;
+	ZLOutputStream *createOutputStream(const std::string &path) const;
+	bool removeFile(const std::string &path) const;
+
+	ZLFileInfo fileInfo(const std::string &path) const;
 
 	int findArchiveFileNameDelimiter(const std::string &path) const;
 	shared_ptr<ZLDir> rootDirectory() const;
 	const std::string &rootDirectoryPath() const;
 	std::string parentPath(const std::string &path) const;
-
-	void moveFile(const std::string &oldName, const std::string &newName);
-	void getStat(const std::string &path, bool includeSymlinks, struct stat &fileInfo) const;
 };
 
 #endif /* __ZLUNIXFSMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/iconv/IConvEncodingConverter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -86,7 +86,11 @@
 	char *out = (char*)dst.data() + oldLength;
 
 iconvlabel:
+#ifdef DO_ICONV_CAST
+	iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize);
+#else // DO_ICONV_CAST
 	iconv(myIConverter, &in, &inSize, &out, &outSize);
+#endif // DO_ICONV_CAST
 	if (inSize != 0) {
 		if (myBuffer.empty()) {
 			myBuffer.append(in, inSize);
@@ -125,9 +129,13 @@
 		inSize = 1;
 		outSize = 3;
 		inBuffer[0] = i;
+#ifdef DO_ICONV_CAST
+		iconv(myIConverter, (const char**)&in, &inSize, &out, &outSize);
+#else // DO_ICONV_CAST
 		iconv(myIConverter, &in, &inSize, &out, &outSize);
+#endif // DO_ICONV_CAST
 		if (inSize == 0) {
-			ZLUnicodeUtil::Ucs2Char ch;
+			ZLUnicodeUtil::Ucs4Char ch;
 			ZLUnicodeUtil::firstChar(ch, outBuffer);
 			map[i] = ch;
 		} else {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/iconv/IConvEncodingConverter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/iconv/IConvEncodingConverter.h
--- fbreader-0.8.17/zlibrary/core/src/unix/iconv/IConvEncodingConverter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/iconv/IConvEncodingConverter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 
 #include <algorithm>
+#include <iostream>
 
 #include <ZLibrary.h>
 #include <ZLStringUtil.h>
@@ -33,23 +34,25 @@
 const std::string ZLibrary::PathDelimiter(":");
 const std::string ZLibrary::EndOfLine("\n");
 
-std::string ZLibrary::Language() {
-	if (!ourLanguage.empty()) {
-		return ourLanguage;
-	}
-
+void ZLibrary::initLocale() {
 	const char *locale = setlocale(LC_MESSAGES, ""); 
 	if (locale != 0) {
-		std::string lang = locale;
-		int index = std::min(lang.find('.'), std::min(lang.find('_'), lang.find('-')));
-		if (index != -1) {
-			lang = lang.substr(0, index);
-		}
-		if (!lang.empty()) {
-			return lang;
+		std::string sLocale = locale;
+		const int dotIndex = sLocale.find('.');
+		if (dotIndex != -1) {
+			sLocale = sLocale.substr(0, dotIndex);
+		}
+		const int dashIndex = std::min(sLocale.find('_'), sLocale.find('-'));
+		if (dashIndex == -1) {
+			ourLanguage = sLocale;
+		} else {
+			ourLanguage = sLocale.substr(0, dashIndex);
+			ourCountry = sLocale.substr(dashIndex + 1);
+			if ((ourLanguage == "es") && (ourCountry != "ES")) {
+				ourCountry = "LA";
+			}
 		}
 	}
-	return "en";
 }
 
 ZLibraryImplementation *ZLibraryImplementation::Instance = 0;
@@ -97,20 +100,26 @@
 		closedir(dir);
 
 		std::sort(names.begin(), names.end());
-		for (std::vector<std::string>::const_iterator it = names.begin();
-				 (it != names.end()) && (handle == 0); ++it) {
+		for (std::vector<std::string>::const_iterator it = names.begin(); it != names.end(); ++it) {
+			std::cerr << "loading " << *it << "...\n";
 			handle = dlopen(it->c_str(), RTLD_NOW);
+			if (handle == 0) {
+				std::cerr << dlerror() << "\n";
+			} else {
+				break;
+			}
 		}
 
 		if (handle == 0) {
 			return false;
 		}
 	}
-	dlerror();
 
 	void (*initLibrary)();
 	*(void**)&initLibrary = dlsym(handle, "initLibrary");
-	if (dlerror() != 0) {
+	const char *error = dlerror();
+	if (error != 0) {
+		std::cerr << error << "\n";
 		return false;
 	}
 #endif /* ZLSHARED */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/library/ZLibraryImplementation.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/library/ZLibraryImplementation.h
--- fbreader-0.8.17/zlibrary/core/src/unix/library/ZLibraryImplementation.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/library/ZLibraryImplementation.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/time/ZLUnixTime.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/time/ZLUnixTime.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/time/ZLUnixTime.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/time/ZLUnixTime.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/time/ZLUnixTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/time/ZLUnixTime.h
--- fbreader-0.8.17/zlibrary/core/src/unix/time/ZLUnixTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/time/ZLUnixTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/AsciiEncoder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfig.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDelta.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigDeltaWriter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfig.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfig.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfig.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfig.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigIO.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigIO.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigIO.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigIO.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,21 +50,22 @@
 		it->second = new XMLConfigGroup(*it->second);
 	}
 	shared_ptr<ZLDir> configDir = ZLFile(configDirName()).directory(false);
-	if (configDir.isNull()) {
-		return;
-	}
-	std::vector<std::string> fileNames;
-	configDir->collectFiles(fileNames, true);
-	for (std::vector<std::string>::const_iterator it = fileNames.begin(); it != fileNames.end(); ++it) {
-		ZLFile configFile(configDir->itemPath(*it));
-		if (configFile.extension() == "xml") {
-			XMLConfigReader(*this, configFile.name(true)).readDocument(configFile.inputStream());
+	if (!configDir.isNull()) {
+		std::vector<std::string> fileNames;
+		configDir->collectFiles(fileNames, true);
+		for (std::vector<std::string>::const_iterator it = fileNames.begin(); it != fileNames.end(); ++it) {
+			ZLFile configFile(configDir->itemPath(*it));
+			if (configFile.extension() == "xml") {
+				XMLConfigReader(*this, configFile.name(true)).readDocument(configFile.inputStream());
+			}
 		}
 	}
 	if (myDelta == 0) {
 		myDelta = new XMLConfigDelta();
 	}
-	XMLConfigReader(*this, UNKNOWN_CATEGORY).readDocument(configDir->itemPath(CHANGES_FILE));
+	if (!configDir.isNull()) {
+		XMLConfigReader(*this, UNKNOWN_CATEGORY).readDocument(configDir->itemPath(CHANGES_FILE));
+	}
 }
 
 void XMLConfig::saveAll() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigValue.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigValue.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigValue.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigValue.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.cpp
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.h
--- fbreader-0.8.17/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/unix/xmlconfig/XMLConfigWriter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/allocator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/allocator.h
--- fbreader-0.8.17/zlibrary/core/src/util/allocator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/allocator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/shared_ptr.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/shared_ptr.h
--- fbreader-0.8.17/zlibrary/core/src/util/shared_ptr.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/shared_ptr.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLBoolean3.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLBoolean3.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLBoolean3.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLBoolean3.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLColor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLColor.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLColor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLColor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLKeyUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLKeyUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/util/ZLKeyUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLKeyUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -78,7 +78,7 @@
 		if (((unicode < 128) && isprint(unicode) && !isspace(unicode)) || ZLUnicodeUtil::isLetter(unicode)) {
 			name += '<';
 			char buf[5];
-			name.append(buf, ZLUnicodeUtil::ucs2ToUtf8(buf, ZLUnicodeUtil::toUpper(unicode)));
+			name.append(buf, ZLUnicodeUtil::ucs4ToUtf8(buf, ZLUnicodeUtil::toUpper(unicode)));
 			name += '>';
 		}
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLKeyUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLKeyUtil.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLKeyUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLKeyUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLLanguageUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLLanguageUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/util/ZLLanguageUtil.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLLanguageUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLLanguageUtil.h"
+
+std::string ZLLanguageUtil::languageByCode(unsigned char languageCode, unsigned char subLanguageCode) {
+	switch (languageCode) {
+		default:   return "other";
+		case 0x01: return "ar";  // Arabic
+		case 0x02: return "bg";  // Bulgarian
+		case 0x03: return "ca";  // Catalan
+		case 0x04: return "zh";  // Chinese
+		case 0x05: return "cs";  // Czech
+		case 0x06: return "da";  // Danish
+		case 0x07: return "de";  // German
+		case 0x08: return "el";  // Greek
+		case 0x09: return "en";  // English
+		case 0x0A: return "es";  // Spanish
+		case 0x0B: return "fi";  // Finnish
+		case 0x0C: return "fr";  // French
+		case 0x0D: return "he";  // Hebrew
+		case 0x0E: return "hu";  // Hungarian
+		case 0x0F: return "is";  // Icelandic
+		case 0x10: return "it";  // Italian
+		case 0x11: return "ja";  // Japanese
+		case 0x12: return "ko";  // Korean
+		case 0x13: return "nl";  // Dutch
+		case 0x14: return "no";  // Norwegian
+		case 0x15: return "pl";  // Polish
+		case 0x16: return "pt";  // Portuguese
+		case 0x17: return "rm";  // Romansh
+		case 0x18: return "ro";  // Romanian
+		case 0x19: return "ru";  // Russian
+		case 0x1A:
+			switch (subLanguageCode) {
+				default:   return "sr";  // Serbian
+				case 0x04:
+				case 0x10: return "hr";  // Croatian
+				case 0x14:
+				case 0x20:
+				case 0x78: return "bs";  // Bosnian
+                        }
+		case 0x1B: return "sk";  // Slovak
+		case 0x1C: return "sq";  // Albanian
+		case 0x1D: return "sv";  // Swedish
+		case 0x1E: return "th";  // Thai
+		case 0x1F: return "tr";  // Turkish
+		case 0x20: return "ur";  // Urdu
+		case 0x21: return "id";  // Indonesian
+		case 0x22: return "uk";  // Ukrainian
+		case 0x23: return "be";  // Belarusian
+		case 0x24: return "sl";  // Slovenian
+		case 0x25: return "et";  // Estonian
+		case 0x26: return "lv";  // Latvian
+		case 0x27: return "lt";  // Lithuanian
+		case 0x28: return "tg";  // Tajik
+		case 0x29: return "fa";  // Persian (Farsi)
+		case 0x2A: return "vi";  // Vietnamese
+		case 0x2B: return "hy";  // Armenian
+		case 0x2C: return "az";  // Azeri
+		case 0x2D: return "eu";  // Basque
+		case 0x2E: return (subLanguageCode == 0x08)
+			? "dsb"          // Lower Sorbian
+			: "wen";         // Upper Sorbian
+		case 0x2F: return "mk";  // Makedonian
+		case 0x32: return "tn";  // Setswana/Tswana
+		case 0x34: return "xh";  // Xhosa/isiXhosa
+		case 0x35: return "zu";  // Zulu/isiZulu
+		case 0x36: return "af";  // Afrikaans
+		case 0x37: return "ka";  // Georgian
+		case 0x38: return "fo";  // Faeroese
+		case 0x39: return "hi";  // Hindi
+		case 0x3A: return "mt";  // Maltese
+		case 0x3B: return "se";  // Sami
+		case 0x3C: return "ga";  // Irish
+		case 0x3E: return "ms";  // Malay
+		case 0x3F: return "kk";  // Kazak
+		case 0x40: return "ky";  // Kyrgyz
+		case 0x41: return "sw";  // Swahili
+		case 0x42: return "tk";  // Turkmen
+		case 0x43: return "uz";  // Uzbek
+		case 0x44: return "tt";  // Tatar
+		case 0x45: return "bn";  // Bengali
+		case 0x46: return "pa";  // Punjabi
+		case 0x47: return "gu";  // Gujaratu
+		case 0x48: return "or";  // Oriya
+		case 0x49: return "ta";  // Tamil
+		case 0x4A: return "te";  // Telugi
+		case 0x4B: return "kn";  // Kannada
+		case 0x4C: return "ml";  // Malayalam
+		case 0x4D: return "as";  // Assamese
+		case 0x4E: return "mr";  // Marathi
+		case 0x4F: return "sa";  // Sanskrit
+		case 0x50: return "mn";  // Mongolian
+		case 0x51: return "bo";  // Tibetian
+		case 0x52: return "cy";  // Welsh
+		case 0x53: return "kh";  // Khmer
+		case 0x54: return "lo";  // Lao
+		case 0x56: return "gl";  // Galician
+		case 0x57: return "kok"; // Konkani
+		case 0x58: return "mni"; // Manipuri
+		case 0x59: return "sd";  // Sindhi
+		case 0x5A: return "syr"; // Syriac
+		case 0x5B: return "si";  // Sinhala
+		case 0x5D: return "iu";  // Inuktitut
+		case 0x5E: return "am";  // Amharic
+		case 0x5F: return "tzm"; // Tamazight
+		case 0x60: return "ks";  // Kashmiri
+		case 0x61: return "ne";  // Nepali
+		case 0x62: return "fy";  // Frisian
+		case 0x63: return "ps";  // Pashto
+		case 0x64: return "fil"; // Filipino
+		case 0x65: return "dv";  // Divehi
+		case 0x68: return "ha";  // Hausa
+		case 0x6A: return "yo";  // Yoruba
+		case 0x6B: return "quz"; // Quechua
+		case 0x6C: return "ns";  // Northern Sotho
+		case 0x6D: return "ba";  // Bashkir
+		case 0x6E: return "lb";  // Luxemburgish
+		case 0x6F: return "kl";  // Greenlandic
+		case 0x70: return "ig";  // Igbo
+		case 0x73: return "ti";  // Tigrinya
+		case 0x78: return "yi";  // Yi
+		case 0x7A: return "arn"; // Mapudungun
+		case 0x7C: return "moh"; // Mohawk
+		case 0x7E: return "be";  // Breton
+		case 0x80: return "ug";  // Uighur
+		case 0x81: return "mi";  // Maori
+		case 0x82: return "oc";  // Occitan
+		case 0x83: return "co";  // Corsican
+		case 0x84: return "gsw"; // Alsatian
+		case 0x85: return "sah"; // Yakut
+		case 0x86: return "qut"; // K'iche
+		case 0x87: return "rw";  // Kinyarwanda
+		case 0x88: return "wo";  // Wolof
+		case 0x8C: return "prs"; // Dari
+		case 0x8D: return "mg";  // Malagasy
+	}
+}
+
+bool ZLLanguageUtil::isRTLLanguage(const std::string &languageCode) {
+	return
+		(languageCode == "ar") ||
+		(languageCode == "he");
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLLanguageUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLLanguageUtil.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLLanguageUtil.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLLanguageUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLLANGUAGEUTIL_H__
+#define __ZLLANGUAGEUTIL_H__
+
+#include <string>
+
+class ZLLanguageUtil {
+
+private:
+	ZLLanguageUtil();
+
+public:
+	static std::string languageByCode(unsigned char languageCode, unsigned char subLanguageCode);
+	static bool isRTLLanguage(const std::string &languageCode);
+};
+
+#endif /* __ZLLANGUAGEUTIL_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLSearchUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLSearchUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/util/ZLSearchUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLSearchUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLSearchUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLSearchUtil.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLSearchUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLSearchUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLStringUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLStringUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/util/ZLStringUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLStringUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLStringUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLStringUtil.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLStringUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLStringUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLUnicodeUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUnicodeUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/util/ZLUnicodeUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUnicodeUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,72 @@
  * 02110-1301, USA.
  */
 
+#include <stdlib.h>
+#include <map>
+
+#include <ZLibrary.h>
+#include <ZLXMLReader.h>
+
 #include "ZLUnicodeUtil.h"
 
+struct ZLUnicodeData {
+	enum SymbolType {
+		LETTER_LOWERCASE,
+		LETTER_UPPERCASE,
+		UNKNOWN
+	};
+
+	const SymbolType Type;
+	const ZLUnicodeUtil::Ucs4Char LowerCase;
+	const ZLUnicodeUtil::Ucs4Char UpperCase;
+
+	ZLUnicodeData(const SymbolType type, ZLUnicodeUtil::Ucs4Char lowerCase, ZLUnicodeUtil::Ucs4Char upperCase);
+};
+
+ZLUnicodeData::ZLUnicodeData(const SymbolType type, ZLUnicodeUtil::Ucs4Char lowerCase, ZLUnicodeUtil::Ucs4Char upperCase) : Type(type), LowerCase(lowerCase), UpperCase(upperCase) {
+}
+
+static std::map<ZLUnicodeUtil::Ucs4Char,ZLUnicodeData> UNICODE_TABLE;
+
+class ZLUnicodeTableReader : public ZLXMLReader {
+
+private:
+	void startElementHandler(const char *tag, const char **attributes);
+};
+
+void ZLUnicodeTableReader::startElementHandler(const char *tag, const char **attributes) {
+	static std::string SYMBOL_TAG = "symbol";
+	static std::string LETTER_LOWERCASE_TYPE = "Ll";
+	static std::string LETTER_UPPERCASE_TYPE = "Lu";
+
+	if (SYMBOL_TAG == tag) {
+		const char *codeS = attributeValue(attributes, "code");
+		const ZLUnicodeUtil::Ucs4Char code = strtol(codeS, 0, 16);
+		const char *typeS = attributeValue(attributes, "type");
+		ZLUnicodeData::SymbolType type = ZLUnicodeData::UNKNOWN;
+		if (LETTER_LOWERCASE_TYPE == typeS) {
+			type = ZLUnicodeData::LETTER_LOWERCASE;
+		} else if (LETTER_UPPERCASE_TYPE == typeS) {
+			type = ZLUnicodeData::LETTER_UPPERCASE;
+		}
+		const char *lowerS = attributeValue(attributes, "lower");
+		const ZLUnicodeUtil::Ucs4Char lower = (lowerS != 0) ? strtol(lowerS, 0, 16) : code;
+		const char *upperS = attributeValue(attributes, "upper");
+		const ZLUnicodeUtil::Ucs4Char upper = (upperS != 0) ? strtol(upperS, 0, 16) : code;
+		UNICODE_TABLE.insert(std::pair<ZLUnicodeUtil::Ucs4Char,ZLUnicodeData>(code, ZLUnicodeData(type, lower, upper)));
+	}
+}
+
+static void initUnicodeTable() {
+	static bool inProgress = false;
+	if (!inProgress && UNICODE_TABLE.empty()) {
+		inProgress = true;
+		ZLUnicodeTableReader reader;
+		reader.readDocument(ZLibrary::ZLibraryDirectory() + ZLibrary::FileNameDelimiter + "unicode.xml.gz");
+		inProgress = false;
+	}
+}
+
 bool ZLUnicodeUtil::isUtf8String(const char *str, int len) {
 	const char *last = str + len;
 	int nonLeadingCharsCounter = 0;
@@ -91,6 +155,46 @@
 	return length(str.data(), utf8Length);
 }
 
+void ZLUnicodeUtil::utf8ToUcs4(Ucs4String &to, const char *from, int length, int toLength) {
+	to.clear();
+	if (toLength < 0) {
+		toLength = utf8Length(from, length);
+	}
+	to.reserve(toLength);
+	const char *last = from + length;
+	for (const char *ptr = from; ptr < last;) {
+		if ((*ptr & 0x80) == 0) {
+			to.push_back(*ptr);
+			++ptr;
+		} else if ((*ptr & 0x20) == 0) {
+			Ucs4Char ch = *ptr & 0x1f;
+			++ptr;
+			ch <<= 6;
+			ch += *ptr & 0x3f;
+			to.push_back(ch);
+			++ptr;
+		} else if ((*ptr & 0x10) == 0) {
+			Ucs4Char ch = *ptr & 0x0f;
+			++ptr;
+			ch <<= 6;
+			ch += *ptr & 0x3f;
+			++ptr;
+			ch <<= 6;
+			ch += *ptr & 0x3f;
+			to.push_back(ch);
+			++ptr;
+		} else {
+			// symbol number is > 0xffff :(
+			to.push_back('X');
+			ptr += 4;
+		}
+	}
+}
+
+void ZLUnicodeUtil::utf8ToUcs4(Ucs4String &to, const std::string &from, int toLength) {
+	utf8ToUcs4(to, from.data(), from.length(), toLength);
+}
+
 void ZLUnicodeUtil::utf8ToUcs2(Ucs2String &to, const char *from, int length, int toLength) {
 	to.clear();
 	if (toLength < 0) {
@@ -131,7 +235,7 @@
 	utf8ToUcs2(to, from.data(), from.length(), toLength);
 }
 
-int ZLUnicodeUtil::firstChar(Ucs2Char &ch, const char *utf8String) {
+int ZLUnicodeUtil::firstChar(Ucs4Char &ch, const char *utf8String) {
 	if ((*utf8String & 0x80) == 0) {
 		ch = *utf8String;
 		return 1;
@@ -150,6 +254,33 @@
 	}
 }
 
+int ZLUnicodeUtil::ucs4ToUtf8(char *to, Ucs4Char ch) {
+	if (ch < 0x80) {
+		*to = (char)ch;
+		return 1;
+	} else if (ch < 0x800) {
+		*to = (char)(0xC0 | (ch >> 6));
+		*(to + 1) = (char)(0x80 | (ch & 0x3F));
+		return 2;
+	} else {
+		*to = (char)(0xE0 | ch >> 12);
+		*(to + 1) = (char)(0x80 | ((ch >> 6) & 0x3F));
+		*(to + 2) = (char)(0x80 | (ch & 0x3F));
+		return 3;
+	}
+}
+
+void ZLUnicodeUtil::ucs4ToUtf8(std::string &to, const Ucs4String &from, int toLength) {
+	char buffer[3];
+	to.erase();
+	if (toLength > 0) {
+		to.reserve(toLength);
+	}
+	for (Ucs4String::const_iterator it = from.begin(); it != from.end(); ++it) {
+		to.append(buffer, ucs4ToUtf8(buffer, *it));
+	}
+}
+
 int ZLUnicodeUtil::ucs2ToUtf8(char *to, Ucs2Char ch) {
 	if (ch < 0x80) {
 		*to = (char)ch;
@@ -177,25 +308,22 @@
 	}
 }
 
-bool ZLUnicodeUtil::isLetter(Ucs2Char ch) {
-	return
-		(('a' <= ch) && (ch <= 'z')) ||
-		(('A' <= ch) && (ch <= 'Z')) ||
-		// ' is "letter" (in French, for example)
-		(ch == '\'') ||
-		// ^ is "letter" (in Esperanto)
-		(ch == '^') ||
-		// latin1
-		((0xC0 <= ch) && (ch <= 0xFF) && (ch != 0xD7) && (ch != 0xF7)) ||
-		// extended latin1
-		((0x100 <= ch) && (ch <= 0x178)) ||
-		// cyrillic
-		((0x410 <= ch) && (ch <= 0x44F)) ||
-		// cyrillic YO & yo
-		(ch == 0x401) || (ch == 0x451);
+bool ZLUnicodeUtil::isLetter(Ucs4Char ch) {
+	initUnicodeTable();
+	std::map<ZLUnicodeUtil::Ucs4Char,ZLUnicodeData>::const_iterator it = UNICODE_TABLE.find(ch);
+	if (it == UNICODE_TABLE.end()) {
+		return false;
+	}
+	switch (it->second.Type) {
+		case ZLUnicodeData::LETTER_LOWERCASE:
+		case ZLUnicodeData::LETTER_UPPERCASE:
+			return true;
+		default:
+			return false;
+	}
 }
 
-bool ZLUnicodeUtil::isSpace(Ucs2Char ch) {
+bool ZLUnicodeUtil::isSpace(Ucs4Char ch) {
 	return
 		((9 <= ch) && (ch <= 13)) ||
 		(ch == 32) ||
@@ -209,7 +337,7 @@
 		(ch == 12288);
 }
 
-ZLUnicodeUtil::Breakable ZLUnicodeUtil::isBreakable(Ucs2Char c) {
+ZLUnicodeUtil::Breakable ZLUnicodeUtil::isBreakable(Ucs4Char c) {
 	if (c <= 0x2000) {
 		return NO_BREAKABLE;
 	}
@@ -265,92 +393,48 @@
 	return BREAKABLE_AFTER;
 }
 
-ZLUnicodeUtil::Ucs2Char ZLUnicodeUtil::toLower(Ucs2Char ch) {
-	if (('A' <= ch) && (ch <= 'Z')) {
-		return ch + 'a' - 'A';
-	}
-
-	// latin1
-	if ((0xC0 <= ch) && (ch <= 0xDE) && (ch != 0xD7)) {
-		return ch + 0x20;
-	}
-
-	// extended latin1
-	if ((0x100 <= ch) && (ch <= 0x178)) {
-		return (ch & 0x01) ? ch : (ch + 1);
-	}
-
-	// cyrillic
-	if ((0x410 <= ch) && (ch <= 0x42F)) {
-		return ch + 0x20;
-	}
-
-	// cyrillic yo
-	if (ch == 0x401) {
-		return 0x451;
-	}
-
-	return ch;
+ZLUnicodeUtil::Ucs4Char ZLUnicodeUtil::toLower(Ucs4Char ch) {
+	initUnicodeTable();
+	std::map<ZLUnicodeUtil::Ucs4Char,ZLUnicodeData>::const_iterator it = UNICODE_TABLE.find(ch);
+	return (it != UNICODE_TABLE.end()) ? it->second.LowerCase : ch;
 }
 
-void ZLUnicodeUtil::toLower(Ucs2String &str) {
-	for (Ucs2String::iterator it = str.begin(); it != str.end(); ++it) {
+void ZLUnicodeUtil::toLower(Ucs4String &str) {
+	for (Ucs4String::iterator it = str.begin(); it != str.end(); ++it) {
 		*it = toLower(*it);
 	}
 }
 
 std::string ZLUnicodeUtil::toLower(const std::string &utf8String) {
-	Ucs2String ucs2String;
-	utf8ToUcs2(ucs2String, utf8String);
+	Ucs4String ucs4String;
+	utf8ToUcs4(ucs4String, utf8String);
 
-	toLower(ucs2String);
+	toLower(ucs4String);
 
 	std::string result;
-	ucs2ToUtf8(result, ucs2String, utf8String.length());
+	ucs4ToUtf8(result, ucs4String, utf8String.length());
 	return result;
 }
 
-ZLUnicodeUtil::Ucs2Char ZLUnicodeUtil::toUpper(Ucs2Char ch) {
-	if (('a' <= ch) && (ch <= 'z')) {
-		return ch + 'A' - 'a';
-	}
-
-	// latin1
-	if ((0xE0 <= ch) && (ch <= 0xFE) && (ch != 0xF7)) {
-		return ch - 0x20;
-	}
-
-	// extended latin1
-	if ((0x100 <= ch) && (ch <= 0x178)) {
-		return (ch & 0x01) ? (ch - 1) : ch;
-	}
-
-	// cyrillic
-	if ((0x430 <= ch) && (ch <= 0x44F)) {
-		return ch - 0x20;
-	}
-
-	// cyrillic yo
-	if (ch == 0x451) {
-		return 0x401;
-	}
-
-	return ch;
+ZLUnicodeUtil::Ucs4Char ZLUnicodeUtil::toUpper(Ucs4Char ch) {
+	initUnicodeTable();
+	std::map<ZLUnicodeUtil::Ucs4Char,ZLUnicodeData>::const_iterator it = UNICODE_TABLE.find(ch);
+	return (it != UNICODE_TABLE.end()) ? it->second.UpperCase : ch;
 }
 
-void ZLUnicodeUtil::toUpper(Ucs2String &str) {
-	for (Ucs2String::iterator it = str.begin(); it != str.end(); ++it) {
+void ZLUnicodeUtil::toUpper(Ucs4String &str) {
+	for (Ucs4String::iterator it = str.begin(); it != str.end(); ++it) {
 		*it = toUpper(*it);
 	}
 }
 
 std::string ZLUnicodeUtil::toUpper(const std::string &utf8String) {
-	Ucs2String ucs2String;
-	utf8ToUcs2(ucs2String, utf8String);
+	Ucs4String ucs4String;
+	utf8ToUcs4(ucs4String, utf8String);
 
-	toUpper(ucs2String);
+	toUpper(ucs4String);
 
 	std::string result;
-	ucs2ToUtf8(result, ucs2String, utf8String.length());
+	ucs4ToUtf8(result, ucs4String, utf8String.length());
 	return result;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLUnicodeUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUnicodeUtil.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLUnicodeUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUnicodeUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #ifndef __ZLUNICODEUTIL_H__
 #define __ZLUNICODEUTIL_H__
 
+#include <stdint.h>
 #include <string>
 #include <vector>
 
@@ -29,8 +30,10 @@
 	ZLUnicodeUtil();
 
 public:
-	typedef unsigned short Ucs2Char;
+	typedef uint16_t Ucs2Char;
 	typedef std::vector<Ucs2Char> Ucs2String;
+	typedef uint32_t Ucs4Char;
+	typedef std::vector<Ucs4Char> Ucs4String;
 
 	enum Breakable {
 		NO_BREAKABLE,
@@ -44,26 +47,30 @@
 	static int utf8Length(const std::string &str);
 	static int length(const char *str, int utf8Length);
 	static int length(const std::string &str, int utf8Length);
+	static void utf8ToUcs4(Ucs4String &to, const char *from, int length, int toLength = -1);
+	static void utf8ToUcs4(Ucs4String &to, const std::string &from, int toLength = -1);
 	static void utf8ToUcs2(Ucs2String &to, const char *from, int length, int toLength = -1);
 	static void utf8ToUcs2(Ucs2String &to, const std::string &from, int toLength = -1);
-	static int firstChar(Ucs2Char &ch, const char *utf8String);
+	static int firstChar(Ucs4Char &ch, const char *utf8String);
+	static void ucs4ToUtf8(std::string &to, const Ucs4String &from, int toLength = -1);
+	static int ucs4ToUtf8(char *to, Ucs4Char ch);
 	static void ucs2ToUtf8(std::string &to, const Ucs2String &from, int toLength = -1);
 	static int ucs2ToUtf8(char *to, Ucs2Char ch);
-	static bool isLetter(Ucs2Char ch);
-	static bool isSpace(Ucs2Char ch);
-	static bool isNBSpace(Ucs2Char ch);
-	static Breakable isBreakable(Ucs2Char ch);
+	static bool isLetter(Ucs4Char ch);
+	static bool isSpace(Ucs4Char ch);
+	static bool isNBSpace(Ucs4Char ch);
+	static Breakable isBreakable(Ucs4Char ch);
 
-	static Ucs2Char toLower(Ucs2Char ch);
-	static void toLower(Ucs2String &str);
+	static Ucs4Char toLower(Ucs4Char ch);
+	static void toLower(Ucs4String &str);
 	static std::string toLower(const std::string &utf8String);
 
-	static Ucs2Char toUpper(Ucs2Char ch);
-	static void toUpper(Ucs2String &str);
+	static Ucs4Char toUpper(Ucs4Char ch);
+	static void toUpper(Ucs4String &str);
 	static std::string toUpper(const std::string &utf8String);
 };
 
-inline bool ZLUnicodeUtil::isNBSpace(Ucs2Char ch) {
+inline bool ZLUnicodeUtil::isNBSpace(Ucs4Char ch) {
 	return ch == 160;
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLUserData.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUserData.cpp
--- fbreader-0.8.17/zlibrary/core/src/util/ZLUserData.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUserData.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLUserData.h"
+
+ZLUserData::~ZLUserData() {
+}
+
+ZLUserDataHolder::~ZLUserDataHolder() {
+}
+
+void ZLUserDataHolder::addUserData(const std::string &key, shared_ptr<ZLUserData> data) {
+	myDataMap[key] = data;
+}
+
+void ZLUserDataHolder::removeUserData(const std::string &key) {
+	myDataMap.erase(key);
+}
+
+shared_ptr<ZLUserData> ZLUserDataHolder::getUserData(const std::string &key) const {
+	std::map<std::string,shared_ptr<ZLUserData> >::const_iterator it = myDataMap.find(key);
+	return (it != myDataMap.end()) ? it->second : 0;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/util/ZLUserData.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUserData.h
--- fbreader-0.8.17/zlibrary/core/src/util/ZLUserData.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/util/ZLUserData.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLUSERDATA_H__
+#define __ZLUSERDATA_H__
+
+#include <map>
+#include <string>
+
+#include <shared_ptr.h>
+
+class ZLUserData {
+
+public:
+	virtual ~ZLUserData();
+};
+
+class ZLUserDataHolder {
+
+protected:
+	virtual ~ZLUserDataHolder();
+
+public:
+	void addUserData(const std::string &key, shared_ptr<ZLUserData> data);
+	void removeUserData(const std::string &key);
+	shared_ptr<ZLUserData> getUserData(const std::string &key) const;
+
+private:
+	std::map<std::string,shared_ptr<ZLUserData> > myDataMap;
+};
+
+#endif /* __ZLUSERDATA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/view/ZLPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLPaintContext.cpp
--- fbreader-0.8.17/zlibrary/core/src/view/ZLPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/view/ZLPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLPaintContext.h
--- fbreader-0.8.17/zlibrary/core/src/view/ZLPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,21 +38,13 @@
 		SOLID_FILL,
 		HALF_FILL,
 	};
-	
+
 protected:
 	ZLPaintContext();
 
 public:
 	virtual ~ZLPaintContext();
 
-	int x() const;
-	int y() const;
-
-	void moveXTo(int x);
-	void moveX(int deltaX);
-	void moveYTo(int y);
-	void moveY(int deltaY);
-
 	virtual void clear(ZLColor color) = 0;
 
 	virtual void setFont(const std::string &family, int size, bool bold, bool italic) = 0;
@@ -62,11 +54,11 @@
 	virtual int width() const = 0;
 	virtual int height() const = 0;
 	
-	virtual int stringWidth(const char *str, int len) const = 0;
+	virtual int stringWidth(const char *str, int len, bool rtl) const = 0;
 	virtual int spaceWidth() const = 0;
 	virtual int stringHeight() const = 0;
 	virtual int descent() const = 0;
-	virtual void drawString(int x, int y, const char *str, int len) = 0;
+	virtual void drawString(int x, int y, const char *str, int len, bool rtl) = 0;
 
 	int imageWidth(const ZLImageData &image) const;
 	int imageHeight(const ZLImageData &image) const;
@@ -83,8 +75,6 @@
 	virtual void fillFamiliesList(std::vector<std::string> &families) const = 0;
 
 private:
-	int myX, myY;
-
 	mutable std::vector<std::string> myFamilies;
 
 private:
@@ -94,14 +84,6 @@
 friend class ZLPartialPaintContext;
 };
 
-inline int ZLPaintContext::x() const { return myX; }
-inline int ZLPaintContext::y() const { return myY; }
-
-inline void ZLPaintContext::moveXTo(int x) { myX = x; }
-inline void ZLPaintContext::moveX(int deltaX) { myX += deltaX; }
-inline void ZLPaintContext::moveYTo(int y) { myY = y; }
-inline void ZLPaintContext::moveY(int deltaY) { myY += deltaY; }
-
 inline int ZLPaintContext::imageWidth(const ZLImageData &image) const { return image.width(); }
 inline int ZLPaintContext::imageHeight(const ZLImageData &image) const { return image.height(); }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/view/ZLView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLView.cpp
--- fbreader-0.8.17/zlibrary/core/src/view/ZLView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,20 +18,30 @@
  */
 
 #include "ZLView.h"
+#include "ZLViewWidget.h"
+#include "ZLPaintContext.h"
 #include "../application/ZLApplication.h"
 
-ZLView::ZLView(ZLApplication &application, shared_ptr<ZLPaintContext> context) : myApplication(application), myContext(context) {
+ZLView::ZLView(ZLApplication &application, shared_ptr<ZLPaintContext> context) : myApplication(application), myViewWidget(0), myContext(context) {
 }
 
 ZLView::~ZLView() {
 }
 
+ZLView::ScrollBarInfo::ScrollBarInfo() : Enabled(false), StandardLocation(true), Full(100), From(0), To(100) {
+}
+
 void ZLView::setPaintContext(shared_ptr<ZLPaintContext> context) {
 	myContext = context;
 }
 
 void ZLViewWidget::setView(shared_ptr<ZLView> view) {
+	if (myView != 0) {
+		myView->myViewWidget = 0;
+	}
 	myView = view;
+	view->myViewWidget = this;
+	rotate(myRotation);
 }
 
 bool ZLView::onStylusPress(int, int) {
@@ -53,3 +63,185 @@
 bool ZLView::onFingerTap(int, int) {
 	return false;
 }
+
+void ZLView::setScrollbarEnabled(Direction direction, bool enabled) {
+	if (direction == VERTICAL) {
+		myVerticalScrollbarInfo.Enabled = enabled;
+	} else {
+		myHorizontalScrollbarInfo.Enabled = enabled;
+	}
+	updateScrollbarState();
+}
+
+void ZLView::setScrollbarParameters(Direction direction, size_t full, size_t from, size_t to) {
+	ScrollBarInfo &info = (direction == VERTICAL) ? myVerticalScrollbarInfo : myHorizontalScrollbarInfo;
+	info.Full = full;
+	info.From = from;
+	info.To = to;
+	updateScrollbarParameters();
+}
+
+void ZLView::updateScrollbarState() {
+	if (myViewWidget == 0) {
+		return;
+	}
+	switch (myViewWidget->rotation()) {
+		case DEGREES0:
+		case DEGREES180:
+			myViewWidget->setScrollbarEnabled(VERTICAL, myVerticalScrollbarInfo.Enabled);
+			myViewWidget->setScrollbarEnabled(HORIZONTAL, myHorizontalScrollbarInfo.Enabled);
+			break;
+		case DEGREES90:
+		case DEGREES270:
+			myViewWidget->setScrollbarEnabled(VERTICAL, myHorizontalScrollbarInfo.Enabled);
+			myViewWidget->setScrollbarEnabled(HORIZONTAL, myVerticalScrollbarInfo.Enabled);
+			break;
+	}
+}
+
+void ZLView::updateScrollbarPlacement() {
+	if (myViewWidget == 0) {
+		return;
+	}
+	bool v = true;
+	bool h = true;
+	switch (myViewWidget->rotation()) {
+		case DEGREES0:
+			v = myVerticalScrollbarInfo.StandardLocation;
+			h = myHorizontalScrollbarInfo.StandardLocation;
+			break;
+		case DEGREES90:
+			v = myHorizontalScrollbarInfo.StandardLocation;
+			h = !myVerticalScrollbarInfo.StandardLocation;
+			break;
+		case DEGREES180:
+			v = !myVerticalScrollbarInfo.StandardLocation;
+			h = !myHorizontalScrollbarInfo.StandardLocation;
+			break;
+		case DEGREES270:
+			v = !myHorizontalScrollbarInfo.StandardLocation;
+			h = myVerticalScrollbarInfo.StandardLocation;
+			break;
+	}
+	myViewWidget->setScrollbarPlacement(VERTICAL, v);
+	myViewWidget->setScrollbarPlacement(HORIZONTAL, h);
+}
+
+void ZLView::updateScrollbarParameters(Direction direction, const ScrollBarInfo &info, bool invert) {
+	if (invert) {
+		myViewWidget->setScrollbarParameters(
+			direction,
+			info.Full,
+			info.Full - info.To,
+			info.Full - info.From
+		);
+	} else {
+		myViewWidget->setScrollbarParameters(
+			direction,
+			info.Full,
+			info.From,
+			info.To
+		);
+	}
+}
+
+void ZLView::updateScrollbarParameters() {		
+	if (myViewWidget == 0) {
+		return;
+	}
+
+	switch (myViewWidget->rotation()) {
+		case DEGREES0:
+			updateScrollbarParameters(VERTICAL, myVerticalScrollbarInfo, false);
+			updateScrollbarParameters(HORIZONTAL, myHorizontalScrollbarInfo, false);
+			break;
+		case DEGREES90:
+			updateScrollbarParameters(VERTICAL, myHorizontalScrollbarInfo, true);
+			updateScrollbarParameters(HORIZONTAL, myVerticalScrollbarInfo, false);
+			break;
+		case DEGREES180:
+			updateScrollbarParameters(VERTICAL, myVerticalScrollbarInfo, true);
+			updateScrollbarParameters(HORIZONTAL, myHorizontalScrollbarInfo, true);
+			break;
+		case DEGREES270:
+			updateScrollbarParameters(VERTICAL, myHorizontalScrollbarInfo, false);
+			updateScrollbarParameters(HORIZONTAL, myVerticalScrollbarInfo, true);
+			break;
+	}
+}
+
+void ZLViewWidget::correctDirection(ZLView::Direction &direction, bool &invert) {
+	switch (rotation()) {
+		case ZLView::DEGREES0:
+			invert = false;
+			return;
+		case ZLView::DEGREES90:
+			invert = false;
+			direction =
+				(direction == ZLView::HORIZONTAL) ?
+					ZLView::VERTICAL :
+					ZLView::HORIZONTAL;
+			return;
+		case ZLView::DEGREES180:
+			invert = true;
+			return;
+		case ZLView::DEGREES270:
+			direction =
+				(direction == ZLView::HORIZONTAL) ?
+					ZLView::VERTICAL :
+					ZLView::HORIZONTAL;
+			invert = true;
+			return;
+	}
+}
+
+void ZLViewWidget::onScrollbarMoved(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	if (!myView.isNull()) {
+		bool invert;
+		correctDirection(direction, invert);
+		if (invert) {
+			size_t tmp = full - from;
+			from = full - to;
+			to = tmp;
+		}
+		myView->onScrollbarMoved(direction, full, from, to);
+	}
+}
+
+void ZLViewWidget::onScrollbarStep(ZLView::Direction direction, int steps) {
+	if (!myView.isNull()) {
+		bool invert;
+		correctDirection(direction, invert);
+		myView->onScrollbarStep(direction, invert ? -steps : steps);
+	}
+}
+
+void ZLViewWidget::onScrollbarPageStep(ZLView::Direction direction, int steps) {
+	if (!myView.isNull()) {
+		bool invert;
+		correctDirection(direction, invert);
+		myView->onScrollbarPageStep(direction, invert ? -steps : steps);
+	}
+}
+
+void ZLView::onScrollbarMoved(Direction, size_t, size_t, size_t) {
+}
+
+void ZLView::onScrollbarStep(Direction, int) {
+}
+
+void ZLView::onScrollbarPageStep(Direction, int) {
+}
+
+void ZLViewWidget::rotate(ZLView::Angle rotation) {
+	myRotation = rotation;
+	if (myView != 0) {
+		myView->updateScrollbarState();
+		myView->updateScrollbarPlacement();
+		myView->updateScrollbarParameters();
+	}
+}
+
+ZLView::Angle ZLViewWidget::rotation() const {
+	return myRotation;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/view/ZLView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLView.h
--- fbreader-0.8.17/zlibrary/core/src/view/ZLView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,13 +24,26 @@
 
 #include <shared_ptr.h>
 
-#include <ZLPaintContext.h>
-
 class ZLApplication;
+class ZLViewWidget;
+class ZLPaintContext;
 
 class ZLView {
 
 public:
+	enum Angle {
+		DEGREES0 = 0,
+		DEGREES90 = 90,
+		DEGREES180 = 180,
+		DEGREES270 = 270
+	};
+
+	enum Direction {
+		VERTICAL,
+		HORIZONTAL
+	};
+
+public:
 	ZLView(ZLApplication &application, shared_ptr<ZLPaintContext> context = 0);
 	virtual ~ZLView();
 	virtual void setPaintContext(shared_ptr<ZLPaintContext> context);
@@ -54,54 +67,42 @@
 
 	bool hasContext() const;
 
-private:
-	ZLApplication &myApplication;
-	shared_ptr<ZLPaintContext> myContext;
+	void setScrollbarEnabled(Direction direction, bool enabled);
+	void setScrollbarParameters(Direction direction, size_t full, size_t from, size_t to);
+	virtual void onScrollbarMoved(Direction direction, size_t full, size_t from, size_t to);
+	virtual void onScrollbarStep(Direction direction, int steps);
+	virtual void onScrollbarPageStep(Direction direction, int steps);
 
 private:
-	ZLView(const ZLView&);
-	const ZLView &operator=(const ZLView&);
-};
-
-class ZLViewWidget {
+	struct ScrollBarInfo {
+		ScrollBarInfo();
 
-public:
-	enum Angle {
-		DEGREES0 = 0,
-		DEGREES90 = 90,
-		DEGREES180 = 180,
-		DEGREES270 = 270
+		bool Enabled;
+		bool StandardLocation;
+		size_t Full;
+		size_t From;
+		size_t To;
 	};
 
-protected:
-	ZLViewWidget(Angle initialAngle);
-
-public:
-	virtual ~ZLViewWidget();
-	void setView(shared_ptr<ZLView> view);
-	shared_ptr<ZLView> view() const;
-
-	virtual void trackStylus(bool track) = 0;
-
-	void rotate(Angle rotation);
-	Angle rotation() const;
+	void updateScrollbarState();
+	void updateScrollbarPlacement();
+	void updateScrollbarParameters();
+	void updateScrollbarParameters(Direction direction, const ScrollBarInfo &info, bool invert);
 
-protected:
-	virtual void repaint() = 0;
+private:
+	ZLApplication &myApplication;
+	ZLViewWidget *myViewWidget;
+	shared_ptr<ZLPaintContext> myContext;
+	ScrollBarInfo myVerticalScrollbarInfo;
+	ScrollBarInfo myHorizontalScrollbarInfo;
 
 private:
-	shared_ptr<ZLView> myView;
-	Angle myRotation;
+	ZLView(const ZLView&);
+	const ZLView &operator=(const ZLView&);
 
-friend class ZLApplication;
+friend class ZLViewWidget;
 };
 
-inline ZLViewWidget::ZLViewWidget(Angle initialAngle) : myView(0), myRotation(initialAngle) {}
-inline ZLViewWidget::~ZLViewWidget() {}
-inline shared_ptr<ZLView> ZLViewWidget::view() const { return myView; }
-inline void ZLViewWidget::rotate(Angle rotation) { myRotation = rotation; }
-inline ZLViewWidget::Angle ZLViewWidget::rotation() const { return myRotation; }
-
 inline bool ZLView::hasContext() const { return !myContext.isNull(); }
 inline ZLPaintContext &ZLView::context() const { return *myContext; }
 inline ZLApplication &ZLView::application() { return myApplication; }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/view/ZLViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLViewWidget.h
--- fbreader-0.8.17/zlibrary/core/src/view/ZLViewWidget.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/view/ZLViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLVIEWWIDGET_H__
+#define __ZLVIEWWIDGET_H__
+
+#include <string>
+
+#include "ZLView.h"
+
+class ZLView;
+
+class ZLViewWidget {
+
+protected:
+	ZLViewWidget(ZLView::Angle initialAngle);
+
+public:
+	virtual ~ZLViewWidget();
+	void setView(shared_ptr<ZLView> view);
+	shared_ptr<ZLView> view() const;
+
+	virtual void trackStylus(bool track) = 0;
+
+	void rotate(ZLView::Angle rotation);
+	ZLView::Angle rotation() const;
+
+	virtual void setScrollbarEnabled(ZLView::Direction direction, bool enabled) = 0;
+	virtual void setScrollbarPlacement(ZLView::Direction direction, bool standard) = 0;
+	virtual void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) = 0;
+	void onScrollbarMoved(ZLView::Direction direction, size_t full, size_t from, size_t to);
+	void onScrollbarStep(ZLView::Direction direction, int steps);
+	void onScrollbarPageStep(ZLView::Direction direction, int steps);
+
+private:
+	void correctDirection(ZLView::Direction &direction, bool &invert);
+
+protected:
+	virtual void repaint() = 0;
+
+private:
+	shared_ptr<ZLView> myView;
+	ZLView::Angle myRotation;
+
+friend class ZLApplication;
+};
+
+inline ZLViewWidget::ZLViewWidget(ZLView::Angle initialAngle) : myView(0), myRotation(initialAngle) {}
+inline ZLViewWidget::~ZLViewWidget() {}
+inline shared_ptr<ZLView> ZLViewWidget::view() const { return myView; }
+
+#endif /* __ZLVIEWWIDGET_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/RegistryUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/RegistryUtil.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/config/RegistryUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/RegistryUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/StringEncoder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/StringEncoder.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/config/StringEncoder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/StringEncoder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/StringEncoder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/StringEncoder.h
--- fbreader-0.8.17/zlibrary/core/src/win32/config/StringEncoder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/StringEncoder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32Config.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32Config.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32Config.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32Config.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32Config.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32Config.h
--- fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32Config.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32Config.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32ConfigIO.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32ConfigIO.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32ConfigIO.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32ConfigIO.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32ConfigValue.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32ConfigValue.h
--- fbreader-0.8.17/zlibrary/core/src/win32/config/ZLWin32ConfigValue.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/config/ZLWin32ConfigValue.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 
 private:
 	ZLWin32EncodingConverter(UINT code);
-	~ZLWin32EncodingConverter();
 
 	void convert(std::string &dst, const char *srcStart, const char *srcEnd);
 	void reset();
@@ -43,7 +42,32 @@
 friend class ZLWin32EncodingConverterProvider;
 };
 
+class ZLWin32Utf16EncodingConverter : public ZLEncodingConverter {
+
+private:
+	ZLWin32Utf16EncodingConverter(bool littleEndian);
+
+	void convert(std::string &dst, const char *srcStart, const char *srcEnd);
+	void reset();
+	bool fillTable(int *map);
+
+private:
+	bool myLittleEndian;
+	ZLUnicodeUtil::Ucs2String myBuffer;
+	bool myUseStoredCharacter;
+	unsigned char myStoredCharacter;
+
+friend class ZLWin32EncodingConverterProvider;
+};
+
 bool ZLWin32EncodingConverterProvider::providesConverter(const std::string &encoding) {
+	if (encoding == "UTF-16") {
+		return true;
+	}
+	if (encoding == "UTF-16BE") {
+		return true;
+	}
+
 	UINT code = atoi(encoding.c_str());
 	if (code == 0) {
 		return false;
@@ -51,21 +75,22 @@
 
 	static const std::string TEST = "TEST";
 	int len = TEST.length();
-	ZLUnicodeUtil::Ucs2String ucs2String;
-	ucs2String.insert(ucs2String.end(), len, 0);
-	return MultiByteToWideChar(code, MB_PRECOMPOSED, TEST.c_str(), len, (WCHAR*)&ucs2String.front(), len) == len;
+	return MultiByteToWideChar(code, 0, TEST.c_str(), len, 0, 0) == len;
 }
 
 shared_ptr<ZLEncodingConverter> ZLWin32EncodingConverterProvider::createConverter(const std::string &encoding) {
+	if (encoding == "UTF-16") {
+		return new ZLWin32Utf16EncodingConverter(true);
+	}
+	if (encoding == "UTF-16BE") {
+		return new ZLWin32Utf16EncodingConverter(false);
+	}
 	return new ZLWin32EncodingConverter(atoi(encoding.c_str()));
 }
 
 ZLWin32EncodingConverter::ZLWin32EncodingConverter(UINT code) : myCode(code), myUseStoredCharacter(false) {
 }
 
-ZLWin32EncodingConverter::~ZLWin32EncodingConverter() {
-}
-
 void ZLWin32EncodingConverter::convert(std::string &dst, const char *srcStart, const char *srcEnd) {
 	if ((srcStart == srcEnd) || (myCode == 0)) {
 		return;
@@ -77,7 +102,7 @@
 	if (myUseStoredCharacter) {
 		WCHAR symbol;
 		char buf[2] = { myStoredCharacter, *srcStart };
-		if (MultiByteToWideChar(myCode, MB_PRECOMPOSED, buf, 2, &symbol, 1) == 1) {
+		if (MultiByteToWideChar(myCode, 0, buf, 2, &symbol, 1) == 1) {
 			hasFirstChar = true;
 			myBuffer.push_back(symbol);
 			srcStart++;
@@ -92,14 +117,14 @@
 		if (hasFirstChar) {
 			bufferStart++;
 		}
-		int ucs2Len = MultiByteToWideChar(myCode, MB_PRECOMPOSED, srcStart, len, bufferStart, len);
+		int ucs2Len = MultiByteToWideChar(myCode, 0, srcStart, len, bufferStart, len);
 		myBuffer.erase(myBuffer.begin() + ucs2Len + (hasFirstChar ? 1 : 0), myBuffer.end());
 
 		if (ucs2Len != len) {
 			myRBuffer.append(len, '\0');
 			char defaultChar = 'X';
 			BOOL usedDefaultChar = false;
-			int len1 = WideCharToMultiByte(myCode, MB_PRECOMPOSED, bufferStart, ucs2Len, (char*)myRBuffer.data(), len, &defaultChar, &usedDefaultChar);
+			int len1 = WideCharToMultiByte(myCode, 0, bufferStart, ucs2Len, (char*)myRBuffer.data(), len, &defaultChar, &usedDefaultChar);
 			if (len1 == len - 1) {
 				myUseStoredCharacter = true;
 				myStoredCharacter = *(srcEnd - 1);
@@ -108,7 +133,9 @@
 		}
 	}
 
-	ZLUnicodeUtil::ucs2ToUtf8(dst, myBuffer);
+	std::string toAppend;
+	ZLUnicodeUtil::ucs2ToUtf8(toAppend, myBuffer);
+	dst += toAppend;
 	myBuffer.clear();
 }
 
@@ -125,7 +152,7 @@
 	WCHAR out;
 	for (int i = 0; i < 256; ++i) {
 		in = i;
-		if (MultiByteToWideChar(myCode, MB_PRECOMPOSED, &in, 1, &out, 1) == 1) {
+		if (MultiByteToWideChar(myCode, 0, &in, 1, &out, 1) == 1) {
 			map[i] = out;
 		} else {
 			map[i] = i;
@@ -133,3 +160,63 @@
 	}
 	return true;
 }
+
+ZLWin32Utf16EncodingConverter::ZLWin32Utf16EncodingConverter(bool littleEndian) : myLittleEndian(littleEndian), myUseStoredCharacter(false) {
+}
+
+void ZLWin32Utf16EncodingConverter::convert(std::string &dst, const char *srcStart, const char *srcEnd) {
+	if (srcStart == srcEnd) {
+		return;
+	}
+
+	const unsigned char *ptr = (const unsigned char*)srcStart;
+	ZLUnicodeUtil::Ucs2Char ch;
+
+	myBuffer.clear();
+
+	if (myUseStoredCharacter) {
+		if (myLittleEndian) {
+			ch = *ptr;
+			ch <<= 8;
+			ch += myStoredCharacter;
+		} else {
+			ch = myStoredCharacter;
+			ch <<= 8;
+			ch += *ptr;
+		}
+		myBuffer.push_back(ch);
+		++ptr;
+	}
+
+	const unsigned char *end = (const unsigned char*)srcEnd;
+	if ((end - ptr) % 2 == 1) {
+		myStoredCharacter = *end;
+		myUseStoredCharacter = true;
+		--end;
+	} else {
+		myUseStoredCharacter = false;
+	}
+
+	if (myLittleEndian) {
+		for (; ptr < end; ptr += 2) {
+			myBuffer.push_back((((ZLUnicodeUtil::Ucs2Char)*(ptr + 1)) << 8) + *ptr);
+		}
+	} else {
+		for (; ptr < end; ptr += 2) {
+			myBuffer.push_back((((ZLUnicodeUtil::Ucs2Char)*ptr) << 8) + *(ptr + 1));
+		}
+	}
+
+	std::string toAppend;
+	ZLUnicodeUtil::ucs2ToUtf8(toAppend, myBuffer);
+	dst += toAppend;
+	myBuffer.clear();
+}
+
+void ZLWin32Utf16EncodingConverter::reset() {
+	myUseStoredCharacter = false;
+}
+
+bool ZLWin32Utf16EncodingConverter::fillTable(int *map) {
+	return false;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.h
--- fbreader-0.8.17/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/encoding/ZLWin32EncodingConverter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLWin32FileInputStream.h"
+#include "ZLWin32FSManager.h"
+#include "../util/W32WCHARUtil.h"
+
+ZLWin32FileInputStream::ZLWin32FileInputStream(const std::string &name) : myName(name), myNeedRepositionToStart(false) {
+	myFile = 0;
+}
+
+ZLWin32FileInputStream::~ZLWin32FileInputStream() {
+	//close();
+	if (myFile != 0) {
+		CloseHandle(myFile);
+	}
+}
+
+bool ZLWin32FileInputStream::open() {
+	//close();
+	if (myFile == 0) {
+		ZLUnicodeUtil::Ucs2String wPath = ZLWin32FSManager::longFilePath(myName);
+		myFile = CreateFileW(::wchar(wPath), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+		myOffset = 0;
+	} else {
+		//fseek(myFile, 0, SEEK_SET);
+		myNeedRepositionToStart = true;
+	}
+	return myFile != 0;
+}
+
+size_t ZLWin32FileInputStream::read(char *buffer, size_t maxSize) {
+	if (buffer != 0) {
+		if (myNeedRepositionToStart) {
+			myOffset = SetFilePointer(myFile, 0, 0, FILE_BEGIN);
+			myNeedRepositionToStart = false;
+		}
+		DWORD realSize;
+		ReadFile(myFile, buffer, maxSize, &realSize, 0);
+		myOffset += realSize;
+		return realSize;
+	} else {
+		if (myNeedRepositionToStart) {
+			myOffset = SetFilePointer(myFile, maxSize, 0, FILE_BEGIN);
+			myNeedRepositionToStart = false;
+			return myOffset;
+		} else {
+			size_t oldOffset = myOffset;
+			myOffset = SetFilePointer(myFile, maxSize, 0, FILE_CURRENT);
+			return myOffset - oldOffset;
+		}
+	}
+}
+
+void ZLWin32FileInputStream::close() {
+	//if (myFile != 0) {
+	//	fclose(myFile);
+	//	myFile = 0;
+	//}
+}
+
+size_t ZLWin32FileInputStream::sizeOfOpened() {
+	if (myFile == 0) {
+		return 0;
+	}
+	return GetFileSize(myFile, 0);
+}
+
+void ZLWin32FileInputStream::seek(int offset, bool absoluteOffset) {
+	if (myNeedRepositionToStart) {
+		absoluteOffset = true;
+		myNeedRepositionToStart = false;
+	}
+	myOffset = SetFilePointer(myFile, offset, 0, absoluteOffset ? FILE_BEGIN : FILE_CURRENT);
+}
+
+size_t ZLWin32FileInputStream::offset() const {
+	return myNeedRepositionToStart ? 0 : myOffset;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.h
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileInputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLWIN32FILEINPUTSTREAM_H__
+#define __ZLWIN32FILEINPUTSTREAM_H__
+
+#include <windows.h>
+
+#include <ZLInputStream.h>
+
+class ZLWin32FileInputStream : public ZLInputStream {
+
+public:
+	ZLWin32FileInputStream(const std::string &name);
+	~ZLWin32FileInputStream();
+	bool open();
+	size_t read(char *buffer, size_t maxSize);
+	void close();
+
+	void seek(int offset, bool absoluteOffset);
+	size_t offset() const;
+	size_t sizeOfOpened();
+
+private:
+	std::string myName;
+	HANDLE myFile;
+	size_t myOffset;
+	bool myNeedRepositionToStart;
+};
+
+#endif /* __ZLWIN32FILEINPUTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLWin32FileOutputStream.h"
+#include "ZLWin32FSManager.h"
+#include "../util/W32WCHARUtil.h"
+
+ZLWin32FileOutputStream::ZLWin32FileOutputStream(const std::string &name) : myName(name), myHasErrors(false), myFile(0) {
+}
+
+ZLWin32FileOutputStream::~ZLWin32FileOutputStream() {
+	close();
+}
+
+bool ZLWin32FileOutputStream::open() {
+	close();
+
+	myTemporaryName = myName + ".XYZT";
+	ZLUnicodeUtil::Ucs2String wPath = ZLWin32FSManager::longFilePath(myTemporaryName);
+	myFile = CreateFileW(::wchar(wPath), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
+
+	return myFile != 0;
+}
+
+void ZLWin32FileOutputStream::write(const char *data, size_t len) {
+	DWORD size;
+	myHasErrors |= !WriteFile(myFile, data, len, &size, 0);
+}
+
+void ZLWin32FileOutputStream::write(const std::string &str) {
+	write(str.data(), str.length());
+}
+
+void ZLWin32FileOutputStream::close() {
+	if (myFile != 0) {
+		CloseHandle(myFile);
+		myFile = 0;
+		if (!myHasErrors) {
+			ZLUnicodeUtil::Ucs2String wPath = ZLWin32FSManager::longFilePath(myName);
+			ZLUnicodeUtil::Ucs2String wTPath = ZLWin32FSManager::longFilePath(myTemporaryName);
+			MoveFileExW(::wchar(wTPath), ::wchar(wPath), MOVEFILE_REPLACE_EXISTING);
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.h
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FileOutputStream.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLWIN32FILEOUTPUTSTREAM_H__
+#define __ZLWIN32FILEOUTPUTSTREAM_H__
+
+#include <windows.h>
+
+#include <ZLOutputStream.h>
+
+class ZLWin32FileOutputStream : public ZLOutputStream {
+
+public:
+	ZLWin32FileOutputStream(const std::string &name);
+	~ZLWin32FileOutputStream();
+	bool open();
+	void write(const char *data, size_t len);
+	void write(const std::string &str);
+	void close();
+
+private:
+	std::string myName;
+	std::string myTemporaryName;
+	bool myHasErrors;
+	HANDLE myFile;
+};
+
+#endif /* __ZLWIN32FILEOUTPUTSTREAM_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <windows.h>
+
+#include "ZLWin32FSDir.h"
+#include "../util/W32WCHARUtil.h"
+
+void ZLWin32FSDir::collectSubDirs(std::vector<std::string> &names, bool /*includeSymlinks*/) {
+	std::string pattern = path();
+	if (pattern[pattern.length() - 1] != '\\') {
+		pattern += '\\';
+	}
+	pattern += '*';
+	ZLUnicodeUtil::Ucs2String wPattern;
+	createNTWCHARString(wPattern, pattern);
+
+	WIN32_FIND_DATAW findData;
+	HANDLE handle = FindFirstFileW(::wchar(wPattern), &findData);
+	ZLUnicodeUtil::Ucs2String wFileName;
+	std::string fileName;
+	if (handle != 0) {
+		do {
+			if ((findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) {
+				continue;
+			}
+			wFileName.clear();
+			fileName.erase();
+			for (int i = 0; i < MAX_PATH; ++i) {
+				if (findData.cFileName[i] != 0) {
+					wFileName.push_back(findData.cFileName[i]);
+				} else {
+					break;
+				}
+			}
+			ZLUnicodeUtil::ucs2ToUtf8(fileName, wFileName);
+			if ((fileName != ".") && (fileName != "..")) {
+				names.push_back(fileName);
+			}
+		} while (FindNextFileW(handle, &findData));
+	}
+}
+
+void ZLWin32FSDir::collectFiles(std::vector<std::string> &names, bool /*includeSymlinks*/) {
+	std::string pattern = path();
+	if (pattern[pattern.length() - 1] != '\\') {
+		pattern += '\\';
+	}
+	pattern += '*';
+	ZLUnicodeUtil::Ucs2String wPattern;
+	createNTWCHARString(wPattern, pattern);
+
+	WIN32_FIND_DATAW findData;
+	HANDLE handle = FindFirstFileW(::wchar(wPattern), &findData);
+	ZLUnicodeUtil::Ucs2String wFileName;
+	std::string fileName;
+	if (handle != 0) {
+		do {
+			if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+				continue;
+			}
+			wFileName.clear();
+			fileName.erase();
+			for (int i = 0; i < MAX_PATH; ++i) {
+				if (findData.cFileName[i] != 0) {
+					wFileName.push_back(findData.cFileName[i]);
+				} else {
+					break;
+				}
+			}
+			ZLUnicodeUtil::ucs2ToUtf8(fileName, wFileName);
+			names.push_back(fileName);
+		} while (FindNextFileW(handle, &findData));
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.h
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSDir.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLWIN32FSDIR_H__
+#define __ZLWIN32FSDIR_H__
+
+#include "../../filesystem/ZLFSDir.h"
+
+class ZLWin32FSDir : public ZLFSDir {
+
+public:
+	ZLWin32FSDir(const std::string &name) : ZLFSDir(name) {}
+
+	void collectSubDirs(std::vector<std::string> &names, bool includeSymlinks);
+	void collectFiles(std::vector<std::string> &names, bool includeSymlinks);
+};
+
+#endif /* __ZLWIN32FSDIR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,34 +17,71 @@
  * 02110-1301, USA.
  */
 
-#include <unistd.h>
-#include <sys/stat.h>
 #include <windows.h>
+#include <shlobj.h>
 
 #include <ZLStringUtil.h>
 #include <ZLUnicodeUtil.h>
 
 #include "ZLWin32FSManager.h"
 #include "ZLWin32RootDir.h"
+#include "ZLWin32FSDir.h"
+#include "ZLWin32FileInputStream.h"
+#include "ZLWin32FileOutputStream.h"
+#include "../util/W32WCHARUtil.h"
+
+#define CSIDL_MYDOCUMENTS 5
 
 static std::string getPwdDir() {
-	char pwd[2048];
-	return (getcwd(pwd, 2047) != 0) ? pwd : "";
+	ZLUnicodeUtil::Ucs2String buffer;
+	buffer.assign(2048, 0);
+	GetCurrentDirectoryW(2047, (WCHAR*)&buffer[0]);
+	std::string result;
+	ZLUnicodeUtil::ucs2ToUtf8(result, buffer);
+	result.erase(result.find('\0'));
+	return result;
 }
 
 static std::string getHomeDir() {
-	char *home = getenv("USERPROFILE");
-	return (home != 0) ? home : "";
+	ZLUnicodeUtil::Ucs2String buffer;
+	buffer.assign(2048, 0);
+	SHGetFolderPathW(0, CSIDL_MYDOCUMENTS, 0, 0, (WCHAR*)&buffer[0]);
+	std::string result;
+	ZLUnicodeUtil::ucs2ToUtf8(result, buffer);
+	result.erase(result.find('\0'));
+	return result;
+}
+
+static std::string getAppDir() {
+	ZLUnicodeUtil::Ucs2String buffer;
+	buffer.assign(2048, 0);
+	GetModuleFileNameW(0, (WCHAR*)&buffer[0], 2047);
+	std::string result;
+	ZLUnicodeUtil::ucs2ToUtf8(result, buffer);
+	result.erase(result.rfind('\\'));
+	return result;
 }
 
 ZLFSDir *ZLWin32FSManager::createPlainDirectory(const std::string &path) const {
 	if (path.empty()) {
 		return new ZLWin32RootDir();
 	} else {
-		return ZLPosixFSManager::createPlainDirectory(path);
+		return new ZLWin32FSDir(path);
 	}
 }
 
+ZLInputStream *ZLWin32FSManager::createPlainInputStream(const std::string &path) const {
+	return new ZLWin32FileInputStream(path);
+}
+
+ZLOutputStream *ZLWin32FSManager::createOutputStream(const std::string &path) const {
+	return new ZLWin32FileOutputStream(path);
+}
+
+std::string ZLWin32FSManager::resolveSymlink(const std::string &path) const {
+	return path;
+}
+
 void ZLWin32FSManager::normalize(std::string &path) const {
 	if (path.empty()) {
 		return;
@@ -53,14 +90,7 @@
 	static std::string HomeDir = getHomeDir();
 	static std::string PwdDir = getPwdDir();
 	static std::string APPattern = "%APPLICATION_PATH%";
-	static std::string AP;
-	if (AP.empty()) {
-		AP = _pgmptr;
-		int index = AP.rfind('\\');
-		if (index != -1) {
-			AP = AP.substr(0, index);
-		}
-	}
+	static std::string AP = getAppDir();
 
 	if (path[0] == '~') {
 		path = HomeDir + path.substr(1);
@@ -89,19 +119,34 @@
 }
 
 ZLFSDir *ZLWin32FSManager::createNewDirectory(const std::string &path) const {
-	return (mkdir(path.c_str()) == 0) ? createPlainDirectory(path) : 0;
+	std::vector<ZLUnicodeUtil::Ucs2String> subpaths;
+	std::string current = path;
+
+	while (current.length() > 3) {
+		WIN32_FILE_ATTRIBUTE_DATA data;
+		ZLUnicodeUtil::Ucs2String wPath = longFilePath(current);
+		const bool exists = GetFileAttributesEx(::wchar(wPath), GetFileExInfoStandard, &data);
+		if (exists && ((data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)) {
+			return 0;
+		}
+		subpaths.push_back(wPath);
+		int index = current.rfind('\\');
+		if (index == -1) {
+			return 0;
+		}
+		current.erase(index);
+	}
+
+	for (int i = subpaths.size() - 1; i >= 0; --i) {
+		if (!CreateDirectory(::wchar(subpaths[i]), 0) && (GetLastError() != ERROR_ALREADY_EXISTS)) {
+			return 0;
+		}
+	}
+	return createPlainDirectory(path);
 }
 
 std::string ZLWin32FSManager::convertFilenameToUtf8(const std::string &name) const {
-	int len = name.length();
-	ZLUnicodeUtil::Ucs2String ucs2String;
-	ucs2String.insert(ucs2String.end(), len, 0);
-	int ucs2Len = MultiByteToWideChar(GetACP(), MB_PRECOMPOSED, name.c_str(), len, (WCHAR*)&ucs2String.front(), len);
-	ucs2String.erase(ucs2String.begin() + ucs2Len, ucs2String.end());
-
-	std::string utf8String;
-	ZLUnicodeUtil::ucs2ToUtf8(utf8String, ucs2String);
-	return utf8String;
+	return name;
 }
 
 int ZLWin32FSManager::findArchiveFileNameDelimiter(const std::string &path) const {
@@ -128,24 +173,31 @@
 	return (result.length() == 2) ? result + '\\' : result;
 }
 
-void ZLWin32FSManager::moveFile(const std::string &oldName, const std::string &newName) {
-	remove(newName.c_str());
-	rename(oldName.c_str(), newName.c_str());
-}
-
 ZLFileInfo ZLWin32FSManager::fileInfo(const std::string &path) const {
+	ZLFileInfo info;
 	if (path.empty()) {
-		ZLFileInfo info;
 		info.Exists = true;
 		info.Size = 0;
-		info.MTime = 0;
 		info.IsDirectory = true;
-		return info;
 	} else {
-		return ZLPosixFSManager::fileInfo(path);
+		ZLUnicodeUtil::Ucs2String wPath = longFilePath(path);
+		WIN32_FILE_ATTRIBUTE_DATA data;
+		info.Exists = GetFileAttributesEx(::wchar(wPath), GetFileExInfoStandard, &data);
+		if (info.Exists) {
+			info.IsDirectory = data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
+			info.Size = info.IsDirectory ? 0 : data.nFileSizeLow;
+		}
 	}
+	return info;
+}
+
+bool ZLWin32FSManager::removeFile(const std::string &path) const {
+	ZLUnicodeUtil::Ucs2String wPath = longFilePath(path);
+	return DeleteFileW(::wchar(wPath));
 }
 
-void ZLWin32FSManager::getStat(const std::string &path, bool /*includeSymlinks*/, struct stat &fileInfo) const {
-	stat(path.c_str(), &fileInfo);
+ZLUnicodeUtil::Ucs2String ZLWin32FSManager::longFilePath(const std::string &path) {
+	ZLUnicodeUtil::Ucs2String lfp;
+	::createNTWCHARString(lfp, "\\\\?\\" + path);
+	return lfp;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.h
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32FSManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,20 +20,28 @@
 #ifndef __ZLWIN32FSMANAGER_H__
 #define __ZLWIN32FSMANAGER_H__
 
-#include "../../../../core/src/posix/filesystem/ZLPosixFSManager.h"
+#include <ZLUnicodeUtil.h>
 
-class ZLWin32FSManager : public ZLPosixFSManager {
+#include "../../filesystem/ZLFSManager.h"
+
+class ZLWin32FSManager : public ZLFSManager {
 
 public:
 	static void createInstance() { ourInstance = new ZLWin32FSManager(); }
+
+	static ZLUnicodeUtil::Ucs2String longFilePath(const std::string &path);
 	
 private:
 	ZLWin32FSManager() {}
 	
-protected:
+private:
 	void normalize(std::string &path) const;
+	std::string resolveSymlink(const std::string &path) const;
 	ZLFSDir *createPlainDirectory(const std::string &path) const;
+	ZLInputStream *createPlainInputStream(const std::string &path) const;
+	ZLOutputStream *createOutputStream(const std::string &path) const;
 	ZLFSDir *createNewDirectory(const std::string &path) const;
+	bool removeFile(const std::string &path) const;
 
 	ZLFileInfo fileInfo(const std::string &path) const;
 
@@ -42,9 +50,6 @@
 	shared_ptr<ZLDir> rootDirectory() const;
 	const std::string &rootDirectoryPath() const;
 	std::string parentPath(const std::string &path) const;
-
-	void moveFile(const std::string &oldName, const std::string &newName);
-	void getStat(const std::string &path, bool includeSymlinks, struct stat &fileInfo) const;
 };
 
 #endif /* __ZLWIN32FSMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.cpp
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.h
--- fbreader-0.8.17/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/filesystem/ZLWin32RootDir.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/win32/util/W32WCHARUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/win32/util/W32WCHARUtil.h
--- fbreader-0.8.17/zlibrary/core/src/win32/util/W32WCHARUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/win32/util/W32WCHARUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.cpp
--- fbreader-0.8.17/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,7 +88,8 @@
 
 static void parseDTD(XML_Parser parser, const std::string &fileName) {
 	XML_Parser entityParser = XML_ExternalEntityParserCreate(parser, 0, 0);
-	shared_ptr<ZLInputStream> entityStream = ZLFile(fileName).inputStream();
+	ZLFile dtdFile(fileName);
+	shared_ptr<ZLInputStream> entityStream = dtdFile.inputStream();
 	if (!entityStream.isNull() && entityStream->open()) {
 		const size_t BUFSIZE = 2048;
 		char buffer[BUFSIZE];
@@ -113,26 +114,36 @@
 }
 
 void ZLXMLReaderInternal::init(const char *encoding) {
-	if (!myInitialized) {
-		myInitialized = true;
-		XML_UseForeignDTD(myParser, XML_TRUE);
-
-		const std::vector<std::string> &dtds = myReader.externalDTDs();
-		for (std::vector<std::string>::const_iterator it = dtds.begin(); it != dtds.end(); ++it) {
-			parseDTD(myParser, *it);
-		}
+	if (myInitialized) {
+		XML_ParserReset(myParser, encoding);
+	}
 
-		XML_SetUserData(myParser, &myReader);
-		if (encoding != 0) {
-			XML_SetEncoding(myParser, encoding);
-		}
-		XML_SetStartElementHandler(myParser, fStartElementHandler);
-		XML_SetEndElementHandler(myParser, fEndElementHandler);
-		XML_SetCharacterDataHandler(myParser, fCharacterDataHandler);
-		XML_SetUnknownEncodingHandler(myParser, fUnknownEncodingHandler, 0);
+	myInitialized = true;
+	XML_UseForeignDTD(myParser, XML_TRUE);
+
+	const std::vector<std::string> &dtds = myReader.externalDTDs();
+	for (std::vector<std::string>::const_iterator it = dtds.begin(); it != dtds.end(); ++it) {
+		myDTDStreamLocks.insert(ZLFile(*it).inputStream());
+		parseDTD(myParser, *it);
 	}
+
+	XML_SetUserData(myParser, &myReader);
+	if (encoding != 0) {
+		XML_SetEncoding(myParser, encoding);
+	}
+	XML_SetStartElementHandler(myParser, fStartElementHandler);
+	XML_SetEndElementHandler(myParser, fEndElementHandler);
+	XML_SetCharacterDataHandler(myParser, fCharacterDataHandler);
+	XML_SetUnknownEncodingHandler(myParser, fUnknownEncodingHandler, 0);
 }
 
+#include <iostream>
+
 bool ZLXMLReaderInternal::parseBuffer(const char *buffer, size_t len) {
-	return XML_Parse(myParser, buffer, len, 0) != XML_STATUS_ERROR;
+	int code = XML_Parse(myParser, buffer, len, 0);
+	if (code == XML_STATUS_ERROR) {
+		std::cerr << XML_GetErrorCode(myParser) << " error\n";
+	}
+	return code != XML_STATUS_ERROR;
+	//return XML_Parse(myParser, buffer, len, 0) != XML_STATUS_ERROR;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.h
--- fbreader-0.8.17/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/xml/expat/ZLXMLReaderInternal.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 
 #include <expat.h>
 
+#include <set>
+
 class ZLXMLReader;
 
 class ZLXMLReaderInternal {
@@ -41,6 +43,8 @@
 	ZLXMLReader &myReader;
 	XML_Parser myParser;
 	bool myInitialized;
+
+	std::set<shared_ptr<ZLInputStream> > myDTDStreamLocks;
 };
 
 #endif /* __ZLXMLREADERINTERNAL_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLReader.cpp
--- fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
 void ZLXMLReader::endElementHandler(const char*) {
 }
 
-void ZLXMLReader::characterDataHandler(const char*, int) {
+void ZLXMLReader::characterDataHandler(const char*, size_t) {
 }
 
 void ZLXMLReader::namespaceListChangedHandler() {
@@ -81,27 +81,37 @@
 			}
 		}
 	}
-	myInternalReader->init(useWindows1252 ? "windows-1252" : 0);
-
-	myInterrupted = false;
-
-	myNamespaces.push_back(new std::map<std::string, std::string>());
+	initialize(useWindows1252 ? "windows-1252" : 0);
 
 	size_t length;
 	do {
 		length = stream->read(myParserBuffer, BUFFER_SIZE);
-		if (!myInternalReader->parseBuffer(myParserBuffer, length)) {
+		if (!readFromBuffer(myParserBuffer, length)) {
 			break;
 		}
 	} while ((length == BUFFER_SIZE) && !myInterrupted);
 
 	stream->close();
 
-	myNamespaces.clear();
+	shutdown();
 
 	return true;
 }
 
+void ZLXMLReader::initialize(const char *encoding) {
+	myInternalReader->init(encoding);
+	myInterrupted = false;
+	myNamespaces.push_back(new std::map<std::string, std::string>());
+}
+
+void ZLXMLReader::shutdown() {
+	myNamespaces.clear();
+}
+
+bool ZLXMLReader::readFromBuffer(const char *data, int len) {
+	return myInternalReader->parseBuffer(data, len);
+}
+
 bool ZLXMLReader::processNamespaces() const {
 	return false;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLReader.h
--- fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,16 +36,22 @@
 
 protected:
 	ZLXMLReader(const char *encoding = 0);
-	virtual ~ZLXMLReader();
 	const std::map<std::string,std::string> &namespaces() const;
 
 public:
+	virtual ~ZLXMLReader();
+
 	bool readDocument(shared_ptr<ZLInputStream> stream);
 	bool readDocument(const std::string &fileName);
 
+	void initialize(const char *encoding = 0);
+	void shutdown();
+	bool readFromBuffer(const char *data, int len);
+
+protected:
 	virtual void startElementHandler(const char *tag, const char **attributes);
 	virtual void endElementHandler(const char *tag);
-	virtual void characterDataHandler(const char *text, int len);
+	virtual void characterDataHandler(const char *text, size_t len);
 	virtual bool processNamespaces() const;
 	virtual void namespaceListChangedHandler();
 	virtual const std::vector<std::string> &externalDTDs() const;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLWriter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLWriter.cpp
--- fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLWriter.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLWriter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLWriter.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLWriter.h
--- fbreader-0.8.17/zlibrary/core/src/xml/ZLXMLWriter.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/core/src/xml/ZLXMLWriter.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/SOVERSION /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/SOVERSION
--- fbreader-0.8.17/zlibrary/SOVERSION	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/SOVERSION	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0.9
Binary files /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/data/hyphenationPatterns.zip and /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/data/hyphenationPatterns.zip differ
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextAlignmentType.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextAlignmentType.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextAlignmentType.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextAlignmentType.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextArea.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextArea.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextArea.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextArea.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,20 +42,20 @@
 };
 
 struct ZLTextElementArea : public ZLTextRectangularArea {
-	int ParagraphNumber;
-	int TextElementNumber;
-	int StartCharNumber;
+	int ParagraphIndex;
+	int ElementIndex;
+	int StartCharIndex;
 	int Length;
 	bool AddHyphenationSign;
-	bool ChangeStyle;
 	ZLTextStylePtr Style;
 	ZLTextElement::Kind Kind;
-	ZLTextElementArea(int paragraphNumber, int textElementNumber, int startCharNumber, int length, bool addHyphenationSign, bool changeStyle, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd);
+	unsigned char BidiLevel;
+	ZLTextElementArea(int paragraphIndex, int elementIndex, int startCharIndex, int length, bool addHyphenationSign, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd, unsigned char bidiLevel);
 };
 
 struct ZLTextTreeNodeArea : public ZLTextRectangularArea {
-	int ParagraphNumber;
-	ZLTextTreeNodeArea(int paragraphNumber, int xStart, int xEnd, int yStart, int yEnd);
+	int ParagraphIndex;
+	ZLTextTreeNodeArea(int paragraphIndex, int xStart, int xEnd, int yStart, int yEnd);
 };
 
 typedef std::vector<ZLTextTreeNodeArea> ZLTextTreeNodeMap;
@@ -64,8 +64,8 @@
 
 inline ZLTextRectangularArea::ZLTextRectangularArea(int xStart, int xEnd, int yStart, int yEnd) : XStart(xStart), XEnd(xEnd), YStart(yStart), YEnd(yEnd) {}
 
-inline ZLTextElementArea::ZLTextElementArea(int paragraphNumber, int textElementNumber, int startCharNumber, int length, bool addHyphenationSign, bool changeStyle, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphNumber(paragraphNumber), TextElementNumber(textElementNumber), StartCharNumber(startCharNumber), Length(length), AddHyphenationSign(addHyphenationSign), ChangeStyle(changeStyle), Style(style), Kind(kind) {}
+inline ZLTextElementArea::ZLTextElementArea(int paragraphIndex, int elementIndex, int startCharIndex, int length, bool addHyphenationSign, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd, unsigned char bidiLevel) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphIndex(paragraphIndex), ElementIndex(elementIndex), StartCharIndex(startCharIndex), Length(length), AddHyphenationSign(addHyphenationSign), Style(style), Kind(kind), BidiLevel(bidiLevel) {}
 
-inline ZLTextTreeNodeArea::ZLTextTreeNodeArea(int paragraphNumber, int xStart, int xEnd, int yStart, int yEnd) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphNumber(paragraphNumber) {}
+inline ZLTextTreeNodeArea::ZLTextTreeNodeArea(int paragraphIndex, int xStart, int xEnd, int yStart, int yEnd) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphIndex(paragraphIndex) {}
 
 #endif /* __ZLTEXTAREA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextElement.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextElement.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextElement.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextElement.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,6 +45,8 @@
 		BEFORE_PARAGRAPH_ELEMENT,
 		AFTER_PARAGRAPH_ELEMENT,
 		EMPTY_LINE_ELEMENT,
+		START_REVERSED_SEQUENCE_ELEMENT,
+		END_REVERSED_SEQUENCE_ELEMENT,
 	};
 
 	virtual Kind kind() const = 0;
@@ -58,15 +60,17 @@
 class ZLTextImageElement : public ZLTextElement {
 
 public:
-	ZLTextImageElement(const std::string &id, const shared_ptr<ZLImageData> image);
+	ZLTextImageElement(const std::string &id, shared_ptr<ZLImageData> image);
 	~ZLTextImageElement();
-	Kind kind() const;
-	const ZLImageData &image() const;
+	shared_ptr<ZLImageData> image() const;
 	const std::string &id() const;
 
 private:
+	Kind kind() const;
+
+private:
 	const std::string myId;
-	const shared_ptr<ZLImageData> myImage;
+	shared_ptr<ZLImageData> myImage;
 };
 
 class ZLTextSpecialElement : public ZLTextElement {
@@ -74,19 +78,23 @@
 public:
 	ZLTextSpecialElement(Kind kind);
 	~ZLTextSpecialElement();
+
+private:
 	Kind kind() const;
 
 private:
 	Kind myKind;
 };
 
-class ZLTextForcedControlElement : public ZLTextElement {
+class ZLTextStyleElement : public ZLTextElement {
 
 public:
-	ZLTextForcedControlElement(shared_ptr<ZLTextParagraphEntry> entry);
-	~ZLTextForcedControlElement();
+	ZLTextStyleElement(shared_ptr<ZLTextParagraphEntry> entry);
+	~ZLTextStyleElement();
+	const ZLTextStyleEntry &entry() const;
+
+private:
 	Kind kind() const;
-	const ZLTextForcedControlEntry &entry() const;
 
 private:
 	const shared_ptr<ZLTextParagraphEntry> myEntry;
@@ -96,10 +104,12 @@
 
 public:
 	ZLTextFixedHSpaceElement(unsigned char length);
-	Kind kind() const;
 	unsigned char length() const;
 
 private:
+	Kind kind() const;
+
+private:
 	const unsigned char myLength;
 };
 
@@ -110,12 +120,14 @@
 	~ZLTextControlElement();
 
 public:
-	Kind kind() const;
 	const ZLTextControlEntry &entry() const;
 	ZLTextKind textKind() const;
 	bool isStart() const;
 
 private:
+	Kind kind() const;
+
+private:
 	const shared_ptr<ZLTextParagraphEntry> myEntry;
 
 friend class ZLTextElementPool;
@@ -126,28 +138,23 @@
 
 inline ZLTextImageElement::ZLTextImageElement(const std::string &id, const shared_ptr<ZLImageData> image) : myId(id), myImage(image) {}
 inline ZLTextImageElement::~ZLTextImageElement() {}
-inline ZLTextElement::Kind ZLTextImageElement::kind() const { return IMAGE_ELEMENT; };
-inline const ZLImageData &ZLTextImageElement::image() const { return *myImage; }
+inline shared_ptr<ZLImageData> ZLTextImageElement::image() const { return myImage; }
 inline const std::string &ZLTextImageElement::id() const { return myId; }
 
 inline ZLTextSpecialElement::ZLTextSpecialElement(Kind kind) : myKind(kind) {}
 inline ZLTextSpecialElement::~ZLTextSpecialElement() {}
-inline ZLTextElement::Kind ZLTextSpecialElement::kind() const { return myKind; };
 
-inline ZLTextForcedControlElement::ZLTextForcedControlElement(const shared_ptr<ZLTextParagraphEntry> entry) : myEntry(entry) {}
-inline ZLTextForcedControlElement::~ZLTextForcedControlElement() {}
-inline ZLTextElement::Kind ZLTextForcedControlElement::kind() const { return FORCED_CONTROL_ELEMENT; };
-inline const ZLTextForcedControlEntry &ZLTextForcedControlElement::entry() const { return (const ZLTextForcedControlEntry&)*myEntry; }
+inline ZLTextStyleElement::ZLTextStyleElement(const shared_ptr<ZLTextParagraphEntry> entry) : myEntry(entry) {}
+inline ZLTextStyleElement::~ZLTextStyleElement() {}
+inline const ZLTextStyleEntry &ZLTextStyleElement::entry() const { return (const ZLTextStyleEntry&)*myEntry; }
 
 inline ZLTextControlElement::ZLTextControlElement(const shared_ptr<ZLTextParagraphEntry> entry) : myEntry(entry) {}
 inline ZLTextControlElement::~ZLTextControlElement() {}
-inline ZLTextElement::Kind ZLTextControlElement::kind() const { return CONTROL_ELEMENT; };
 inline const ZLTextControlEntry &ZLTextControlElement::entry() const { return (const ZLTextControlEntry&)*myEntry; }
 inline ZLTextKind ZLTextControlElement::textKind() const { return entry().kind(); }
 inline bool ZLTextControlElement::isStart() const { return entry().isStart(); }
 
 inline ZLTextFixedHSpaceElement::ZLTextFixedHSpaceElement(unsigned char length) : myLength(length) {}
-inline ZLTextElement::Kind ZLTextFixedHSpaceElement::kind() const { return FIXED_HSPACE_ELEMENT; }
 inline unsigned char ZLTextFixedHSpaceElement::length() const { return myLength; }
 
 #endif /* __ZLTEXTELEMENT_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextHyphenator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextHyphenator.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextHyphenator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextHyphenator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 
 #include <string>
 
+#include <ZLUnicodeUtil.h>
+
 class ZLTextWord;
 
 class ZLTextHyphenationInfo {
@@ -59,7 +61,7 @@
 	ZLTextHyphenationInfo info(const ZLTextWord &word) const;
 
 protected:
-	virtual void hyphenate(std::vector<unsigned short> &ucs2String, std::vector<unsigned char> &mask, int length) const = 0;
+	virtual void hyphenate(ZLUnicodeUtil::Ucs4String &ucs4String, std::vector<unsigned char> &mask, int length) const = 0;
 
 protected:
 	static ZLTextHyphenator *ourInstance;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextKind.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextKind.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextKind.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextKind.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextMark.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextMark.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextMark.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextMark.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +21,11 @@
 #define __ZLTEXTMARK_H__
 
 struct ZLTextMark {
-	int ParagraphNumber;
+	int ParagraphIndex;
 	int Offset, Length;
 
 	ZLTextMark();
-	ZLTextMark(int paragraphNumber, int offset, int length);
+	ZLTextMark(int paragraphIndex, int offset, int length);
 	ZLTextMark(const ZLTextMark &mark);
 	const ZLTextMark &operator = (const ZLTextMark &mark);
 	~ZLTextMark();
@@ -36,11 +36,11 @@
 	bool operator >= (const ZLTextMark &mark) const;
 };
 
-inline ZLTextMark::ZLTextMark() : ParagraphNumber(-1), Offset(-1), Length(-1) {}
-inline ZLTextMark::ZLTextMark(int paragraphNumber, int offset, int length) : ParagraphNumber(paragraphNumber), Offset(offset), Length(length) {}
-inline ZLTextMark::ZLTextMark(const ZLTextMark &mark) : ParagraphNumber(mark.ParagraphNumber), Offset(mark.Offset), Length(mark.Length) {}
+inline ZLTextMark::ZLTextMark() : ParagraphIndex(-1), Offset(-1), Length(-1) {}
+inline ZLTextMark::ZLTextMark(int paragraphIndex, int offset, int length) : ParagraphIndex(paragraphIndex), Offset(offset), Length(length) {}
+inline ZLTextMark::ZLTextMark(const ZLTextMark &mark) : ParagraphIndex(mark.ParagraphIndex), Offset(mark.Offset), Length(mark.Length) {}
 inline const ZLTextMark &ZLTextMark::operator = (const ZLTextMark &mark) {
-	ParagraphNumber = mark.ParagraphNumber;
+	ParagraphIndex = mark.ParagraphIndex;
 	Offset = mark.Offset;
 	Length = mark.Length;
 	return *this;
@@ -48,8 +48,8 @@
 inline ZLTextMark::~ZLTextMark() {}
 
 inline bool ZLTextMark::operator < (const ZLTextMark &mark) const {
-	return (ParagraphNumber < mark.ParagraphNumber) ||
-				 ((ParagraphNumber == mark.ParagraphNumber) && (Offset < mark.Offset));
+	return (ParagraphIndex < mark.ParagraphIndex) ||
+				 ((ParagraphIndex == mark.ParagraphIndex) && (Offset < mark.Offset));
 }
 inline bool ZLTextMark::operator > (const ZLTextMark &mark) const {
 	return mark < *this;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextModel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextModel.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextModel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextModel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,12 +62,13 @@
 	ZLTextMark previousMark(ZLTextMark position) const;
 
 	void addControl(ZLTextKind textKind, bool isStart);
-	void addControl(const ZLTextForcedControlEntry &entry);
-	void addHyperlinkControl(ZLTextKind textKind, const std::string &label);
+	void addControl(const ZLTextStyleEntry &entry);
+	void addHyperlinkControl(ZLTextKind textKind, const std::string &label, const std::string &hyperlinkType);
 	void addText(const std::string &text);
 	void addText(const std::vector<std::string> &text);
 	void addImage(const std::string &id, const ZLImageMap &imageMap, short vOffset);
 	void addFixedHSpace(unsigned char length);
+	void addBidiReset();
 
 protected:
 	void addParagraphInternal(ZLTextParagraph *paragraph);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextParagraphCursor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextParagraphCursor.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextParagraphCursor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextParagraphCursor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@
 public:
 	static ZLTextElementPool Pool;
 
-public:
+private:
 	ZLTextElementPool();
 	~ZLTextElementPool();
 	
@@ -56,8 +56,10 @@
 	ZLTextElement *BeforeParagraphElement;
 	ZLTextElement *AfterParagraphElement;
 	ZLTextElement *EmptyLineElement;
+	ZLTextElement *StartReversedSequenceElement;
+	ZLTextElement *EndReversedSequenceElement;
 
-	ZLTextWord *getWord(const char *data, unsigned short length, size_t paragraphOffset);
+	ZLTextWord *getWord(const char *data, unsigned short length, size_t paragraphOffset, unsigned char bidiLevel);
 	void storeWord(ZLTextWord *word);
 	ZLTextControlElement *getControlElement(shared_ptr<ZLTextParagraphEntry> entry);
 	void storeControlElement(ZLTextControlElement *element);
@@ -72,39 +74,11 @@
 
 class ZLTextParagraphCursor {
 
-private:
-	class Processor {
-
-	private:
-		static bool ourIndexIsInitialised;
-
-	public:
-		Processor(const std::string &language, const ZLTextParagraph &paragraph, const std::vector<ZLTextMark> &marks, int index, ZLTextElementVector &elements);
-		virtual ~Processor();
-		void fill();
-
-	private:
-		void processTextEntry(const ZLTextEntry &textEntry);
-		void addWord(const char *ptr, int offset, int len);
-
-	private:
-		const ZLTextParagraph &myParagraph;
-		ZLTextElementVector &myElements;
-
-		std::vector<ZLTextMark>::const_iterator myFirstMark;
-		std::vector<ZLTextMark>::const_iterator myLastMark;
-		int myOffset;
-
-		const std::string myLanguage;
-		char *myBreaksTable;
-		size_t myBreaksTableLength;
-	};
-
 protected:
-	ZLTextParagraphCursor(const ZLTextModel &model, size_t index);
+	ZLTextParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index);
 
 public:
-	static ZLTextParagraphCursorPtr cursor(const ZLTextModel &model, size_t index = 0);
+	static ZLTextParagraphCursorPtr cursor(const ZLTextModel &model, const std::string &language, size_t index = 0);
 	virtual ~ZLTextParagraphCursor();
 
 	bool isFirst() const;
@@ -134,6 +108,7 @@
 	
 protected:
 	const ZLTextModel &myModel;
+	const std::string &myLanguage;
 	size_t myIndex;
 	ZLTextElementVector myElements;
 
@@ -167,15 +142,15 @@
 	const ZLTextWordCursor &operator = (ZLTextParagraphCursorPtr paragraphCursor);
 
 	bool isNull() const;
-	bool equalWordNumber(const ZLTextWordCursor &cursor) const;
+	bool equalElementIndex(const ZLTextWordCursor &cursor) const;
 	bool sameElementAs(const ZLTextWordCursor &cursor) const;
 	bool operator == (const ZLTextWordCursor &cursor) const;
 	bool operator != (const ZLTextWordCursor &cursor) const;
 	bool operator < (const ZLTextWordCursor &cursor) const;
 	bool isStartOfParagraph() const;
 	bool isEndOfParagraph() const;
-	unsigned int wordNumber() const;
-	unsigned int charNumber() const;
+	unsigned int elementIndex() const;
+	unsigned int charIndex() const;
 	const ZLTextElement &element() const;
 	ZLTextMark position() const;
 	ZLTextParagraphCursorPtr paragraphCursorPtr() const;
@@ -187,22 +162,22 @@
 	bool previousParagraph();
 	void moveToParagraphStart();
 	void moveToParagraphEnd();
-	void moveToParagraph(int paragraphNumber);
-	void moveTo(int wordNumber, int charNumber);
-	void setCharNumber(int charNumber);
+	void moveToParagraph(int paragraphIndex);
+	void moveTo(int elementIndex, int charIndex);
+	void setCharIndex(int charIndex);
 
 	void rebuild();
 
 private:
 	ZLTextParagraphCursorPtr myParagraphCursor;
-	unsigned int myWordNumber;
-	unsigned int myCharNumber;
+	unsigned int myElementIndex;
+	unsigned int myCharIndex;
 };
 
 class ZLTextPlainParagraphCursor : public ZLTextParagraphCursor {
 
 private:
-	ZLTextPlainParagraphCursor(const ZLTextModel &model, size_t index);
+	ZLTextPlainParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index);
 
 public:
 	~ZLTextPlainParagraphCursor();
@@ -217,7 +192,7 @@
 class ZLTextTreeParagraphCursor : public ZLTextParagraphCursor {
 
 private:
-	ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, size_t index);
+	ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, const std::string &language, size_t index);
 
 public:
 	~ZLTextTreeParagraphCursor();
@@ -231,8 +206,8 @@
 
 inline ZLTextElementVector::ZLTextElementVector() {}
 
-inline ZLTextWord *ZLTextElementPool::getWord(const char *data, unsigned short length, size_t paragraphOffset) {
-	return new (myWordAllocator.allocate()) ZLTextWord(data, length, paragraphOffset);
+inline ZLTextWord *ZLTextElementPool::getWord(const char *data, unsigned short length, size_t paragraphOffset, unsigned char bidiLevel) {
+	return new (myWordAllocator.allocate()) ZLTextWord(data, length, paragraphOffset, bidiLevel);
 }
 inline void ZLTextElementPool::storeWord(ZLTextWord *word) {
 	word->~ZLTextWord();
@@ -251,50 +226,50 @@
 inline const ZLTextParagraph &ZLTextParagraphCursor::paragraph() const { return *myModel[myIndex]; }
 inline size_t ZLTextParagraphCursor::paragraphLength() const { return myElements.size(); }
 
-inline ZLTextWordCursor::ZLTextWordCursor() : myWordNumber(0), myCharNumber(0) {}
-inline ZLTextWordCursor::ZLTextWordCursor(const ZLTextWordCursor &cursor) : myParagraphCursor(cursor.myParagraphCursor), myWordNumber(cursor.myWordNumber), myCharNumber(cursor.myCharNumber) {}
+inline ZLTextWordCursor::ZLTextWordCursor() : myElementIndex(0), myCharIndex(0) {}
+inline ZLTextWordCursor::ZLTextWordCursor(const ZLTextWordCursor &cursor) : myParagraphCursor(cursor.myParagraphCursor), myElementIndex(cursor.myElementIndex), myCharIndex(cursor.myCharIndex) {}
 inline const ZLTextWordCursor &ZLTextWordCursor::operator = (const ZLTextWordCursor &cursor) {
 	myParagraphCursor = cursor.myParagraphCursor;
-	myWordNumber = cursor.myWordNumber;
-	myCharNumber = cursor.myCharNumber;
+	myElementIndex = cursor.myElementIndex;
+	myCharIndex = cursor.myCharIndex;
 	return *this;
 }
 
 inline bool ZLTextWordCursor::isNull() const { return myParagraphCursor.isNull(); }
-inline bool ZLTextWordCursor::equalWordNumber(const ZLTextWordCursor &cursor) const {
-	return myWordNumber == cursor.myWordNumber;
+inline bool ZLTextWordCursor::equalElementIndex(const ZLTextWordCursor &cursor) const {
+	return myElementIndex == cursor.myElementIndex;
 }
 inline bool ZLTextWordCursor::sameElementAs(const ZLTextWordCursor &cursor) const {
-	return (myWordNumber == cursor.myWordNumber) && (myParagraphCursor->index() == cursor.myParagraphCursor->index());
+	return (myElementIndex == cursor.myElementIndex) && (myParagraphCursor->index() == cursor.myParagraphCursor->index());
 }
 inline bool ZLTextWordCursor::operator == (const ZLTextWordCursor &cursor) const {
 	return
 		(myParagraphCursor->index() == cursor.myParagraphCursor->index()) &&
-		(myWordNumber == cursor.myWordNumber) &&
-		(myCharNumber == cursor.myCharNumber);
+		(myElementIndex == cursor.myElementIndex) &&
+		(myCharIndex == cursor.myCharIndex);
 }
 inline bool ZLTextWordCursor::operator != (const ZLTextWordCursor &cursor) const {
 	return !operator == (cursor);
 }
-inline const ZLTextElement &ZLTextWordCursor::element() const { return (*myParagraphCursor)[myWordNumber]; }
+inline const ZLTextElement &ZLTextWordCursor::element() const { return (*myParagraphCursor)[myElementIndex]; }
 inline bool ZLTextWordCursor::isStartOfParagraph() const {
-	return (myWordNumber == 0) && (myCharNumber == 0);
+	return (myElementIndex == 0) && (myCharIndex == 0);
 }
 inline bool ZLTextWordCursor::isEndOfParagraph() const {
-	return myWordNumber == myParagraphCursor->paragraphLength();
+	return myElementIndex == myParagraphCursor->paragraphLength();
 }
-inline unsigned int ZLTextWordCursor::wordNumber() const { return myWordNumber; }
-inline unsigned int ZLTextWordCursor::charNumber() const { return myCharNumber; }
+inline unsigned int ZLTextWordCursor::elementIndex() const { return myElementIndex; }
+inline unsigned int ZLTextWordCursor::charIndex() const { return myCharIndex; }
 inline ZLTextParagraphCursorPtr ZLTextWordCursor::paragraphCursorPtr() const { return myParagraphCursor; }
 inline const ZLTextParagraphCursor &ZLTextWordCursor::paragraphCursor() const { return *myParagraphCursor; }
 
-inline void ZLTextWordCursor::nextWord() { ++myWordNumber; myCharNumber = 0; }
-inline void ZLTextWordCursor::previousWord() { --myWordNumber; myCharNumber = 0; }
+inline void ZLTextWordCursor::nextWord() { ++myElementIndex; myCharIndex = 0; }
+inline void ZLTextWordCursor::previousWord() { --myElementIndex; myCharIndex = 0; }
 
-inline ZLTextPlainParagraphCursor::ZLTextPlainParagraphCursor(const ZLTextModel &model, size_t index) : ZLTextParagraphCursor(model, index) {}
+inline ZLTextPlainParagraphCursor::ZLTextPlainParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index) : ZLTextParagraphCursor(model, language, index) {}
 inline ZLTextPlainParagraphCursor::~ZLTextPlainParagraphCursor() {}
 
-inline ZLTextTreeParagraphCursor::ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, size_t index) : ZLTextParagraphCursor(model, index) {}
+inline ZLTextTreeParagraphCursor::ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, const std::string &language, size_t index) : ZLTextParagraphCursor(model, language, index) {}
 inline ZLTextTreeParagraphCursor::~ZLTextTreeParagraphCursor() {}
 
 #endif /* __ZLTEXTPARAGRAPHCURSOR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextParagraph.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextParagraph.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextParagraph.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextParagraph.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,8 +40,9 @@
 		IMAGE_ENTRY = 2,
 		CONTROL_ENTRY = 3,
 		HYPERLINK_CONTROL_ENTRY = 4,
-		FORCED_CONTROL_ENTRY = 5,
+		STYLE_ENTRY = 5,
 		FIXED_HSPACE_ENTRY = 6,
+		RESET_BIDI_ENTRY = 7,
 	};
 
 protected:
@@ -55,37 +56,87 @@
 	const ZLTextParagraphEntry &operator = (const ZLTextParagraphEntry &entry);
 };
 
-class ZLTextForcedControlEntry : public ZLTextParagraphEntry {
+class ZLTextStyleEntry : public ZLTextParagraphEntry {
 
 public:
-	ZLTextForcedControlEntry();
-	ZLTextForcedControlEntry(char *address);
-	~ZLTextForcedControlEntry();
+	enum SizeUnit {
+		SIZE_UNIT_PIXEL,
+		SIZE_UNIT_EM_100,
+		SIZE_UNIT_EX_100,
+		SIZE_UNIT_PERCENT
+	};
+
+	struct Metrics {
+		Metrics(int fontSize, int fontXHeight, int fullWidth, int fullHeight);
+
+		int FontSize;
+		int FontXHeight;
+		int FullWidth;
+		int FullHeight;
+	};
+
+	enum Length {
+		LENGTH_LEFT_INDENT = 0,
+		LENGTH_RIGHT_INDENT = 1,
+		LENGTH_FIRST_LINE_INDENT_DELTA = 2,
+		LENGTH_SPACE_BEFORE = 3,
+		LENGTH_SPACE_AFTER = 4,
+		NUMBER_OF_LENGTHS = 5,
+	};
 
-	bool leftIndentSupported() const;
-	short leftIndent() const;
-	void setLeftIndent(short leftIndent);
+private:
+	struct LengthType {
+		SizeUnit Unit;
+		short Size;
+	};
 
-	bool rightIndentSupported() const;
-	short rightIndent() const;
-	void setRightIndent(short rightIndent);
+public:
+	ZLTextStyleEntry();
+	ZLTextStyleEntry(char *address);
+	~ZLTextStyleEntry();
+
+	bool isEmpty() const;
+
+	bool lengthSupported(Length name) const;
+	short length(Length name, const Metrics &metrics) const;
+	void setLength(Length name, short length, SizeUnit unit);
 
 	bool alignmentTypeSupported() const;
 	ZLTextAlignmentType alignmentType() const;
 	void setAlignmentType(ZLTextAlignmentType alignmentType);
 
-	enum {
-		SUPPORT_LEFT_INDENT = 1 << 0,
-		SUPPORT_RIGHT_INDENT = 1 << 1,
-		SUPPORT_ALIGNMENT_TYPE = 1 << 2,
-	};
+	bool boldSupported() const;
+	bool bold() const;
+	void setBold(bool bold);
+
+	bool italicSupported() const;
+	bool italic() const;
+	void setItalic(bool italic);
+
+	bool fontSizeSupported() const;
+	signed char fontSizeMag() const;
+	void setFontSizeMag(signed char fontSizeMag);
+
+	bool fontFamilySupported() const;
+	const std::string &fontFamily() const;
+	void setFontFamily(const std::string &fontFamily);
+
+	static const int SUPPORT_BOLD = 1 << NUMBER_OF_LENGTHS;
+	static const int SUPPORT_ITALIC = 1 << (NUMBER_OF_LENGTHS + 1);
+	static const int SUPPORT_ALIGNMENT_TYPE = 1 << (NUMBER_OF_LENGTHS + 2);
+	static const int SUPPORT_FONT_SIZE = 1 << (NUMBER_OF_LENGTHS + 3);
+	static const int SUPPORT_FONT_FAMILY = 1 << (NUMBER_OF_LENGTHS + 4);
 
 private:
 	int myMask;
 
-	short myLeftIndent;
-	short myRightIndent;
+	LengthType myLengths[NUMBER_OF_LENGTHS];
+
 	ZLTextAlignmentType myAlignmentType;
+	bool myBold;
+	bool myItalic;
+	signed char myFontSizeMag;
+	std::string myFontFamily;
 
 friend class ZLTextModel;
 };
@@ -139,10 +190,12 @@
 	ZLTextHyperlinkControlEntry(const char *address);
 	~ZLTextHyperlinkControlEntry();
 	const std::string &label() const;
+	const std::string &hyperlinkType() const;
 	bool isHyperlink() const;
 
 private:
-	std::string myLabel;
+	const std::string myLabel;
+	const std::string myHyperlinkType;
 };
 
 class ZLTextEntry : public ZLTextParagraphEntry {
@@ -173,6 +226,15 @@
 	const short myVOffset;
 };
 
+class ResetBidiEntry : public ZLTextParagraphEntry {
+
+public:
+	static const shared_ptr<ZLTextParagraphEntry> Instance;
+
+private:
+	ResetBidiEntry();
+};
+
 class ZLTextParagraph {
 
 public:
@@ -213,7 +275,8 @@
 
 	size_t entryNumber() const;
 
-	size_t textLength() const;
+	size_t textDataLength() const;
+	size_t characterNumber() const;
 
 private:
 	void addEntry(char *address);
@@ -273,17 +336,39 @@
 inline ZLTextParagraphEntry::ZLTextParagraphEntry() {}
 inline ZLTextParagraphEntry::~ZLTextParagraphEntry() {}
 
-inline ZLTextForcedControlEntry::ZLTextForcedControlEntry() : myMask(0) {}
-inline ZLTextForcedControlEntry::~ZLTextForcedControlEntry() {}
-inline bool ZLTextForcedControlEntry::leftIndentSupported() const { return myMask & SUPPORT_LEFT_INDENT; }
-inline short ZLTextForcedControlEntry::leftIndent() const { return myLeftIndent; }
-inline void ZLTextForcedControlEntry::setLeftIndent(short leftIndent) { myLeftIndent = leftIndent; myMask |= SUPPORT_LEFT_INDENT; }
-inline bool ZLTextForcedControlEntry::rightIndentSupported() const { return myMask & SUPPORT_RIGHT_INDENT; }
-inline short ZLTextForcedControlEntry::rightIndent() const { return myRightIndent; }
-inline void ZLTextForcedControlEntry::setRightIndent(short rightIndent) { myRightIndent = rightIndent; myMask |= SUPPORT_RIGHT_INDENT; }
-inline bool ZLTextForcedControlEntry::alignmentTypeSupported() const { return myMask & SUPPORT_ALIGNMENT_TYPE; }
-inline ZLTextAlignmentType ZLTextForcedControlEntry::alignmentType() const { return myAlignmentType; }
-inline void ZLTextForcedControlEntry::setAlignmentType(ZLTextAlignmentType alignmentType) { myAlignmentType = alignmentType; myMask |= SUPPORT_ALIGNMENT_TYPE; }
+inline ZLTextStyleEntry::ZLTextStyleEntry() : myMask(0) {}
+inline ZLTextStyleEntry::~ZLTextStyleEntry() {}
+
+inline ZLTextStyleEntry::Metrics::Metrics(int fontSize, int fontXHeight, int fullWidth, int fullHeight) : FontSize(fontSize), FontXHeight(fontXHeight), FullWidth(fullWidth), FullHeight(fullHeight) {}
+
+inline bool ZLTextStyleEntry::isEmpty() const { return myMask == 0; }
+
+inline bool ZLTextStyleEntry::lengthSupported(Length name) const { return myMask & (1 << name); }
+inline void ZLTextStyleEntry::setLength(Length name, short length, SizeUnit unit) {
+	myLengths[name].Size = length;
+	myLengths[name].Unit = unit;
+	myMask |= 1 << name;
+}
+
+inline bool ZLTextStyleEntry::alignmentTypeSupported() const { return myMask & SUPPORT_ALIGNMENT_TYPE; }
+inline ZLTextAlignmentType ZLTextStyleEntry::alignmentType() const { return myAlignmentType; }
+inline void ZLTextStyleEntry::setAlignmentType(ZLTextAlignmentType alignmentType) { myAlignmentType = alignmentType; myMask |= SUPPORT_ALIGNMENT_TYPE; }
+
+inline bool ZLTextStyleEntry::boldSupported() const { return myMask & SUPPORT_BOLD; }
+inline bool ZLTextStyleEntry::bold() const { return myBold; }
+inline void ZLTextStyleEntry::setBold(bool bold) { myBold = bold; myMask |= SUPPORT_BOLD; }
+
+inline bool ZLTextStyleEntry::italicSupported() const { return myMask & SUPPORT_ITALIC; }
+inline bool ZLTextStyleEntry::italic() const { return myItalic; }
+inline void ZLTextStyleEntry::setItalic(bool italic) { myItalic = italic; myMask |= SUPPORT_ITALIC; }
+
+inline bool ZLTextStyleEntry::fontSizeSupported() const { return myMask & SUPPORT_FONT_SIZE; }
+inline signed char ZLTextStyleEntry::fontSizeMag() const { return myFontSizeMag; }
+inline void ZLTextStyleEntry::setFontSizeMag(signed char fontSizeMag) { myFontSizeMag = fontSizeMag; myMask |= SUPPORT_FONT_SIZE; }
+
+inline bool ZLTextStyleEntry::fontFamilySupported() const { return myMask & SUPPORT_FONT_FAMILY; }
+inline const std::string &ZLTextStyleEntry::fontFamily() const { return myFontFamily; }
+inline void ZLTextStyleEntry::setFontFamily(const std::string &fontFamily) { myFontFamily = fontFamily; myMask |= SUPPORT_FONT_FAMILY; }
 
 inline ZLTextControlEntry::ZLTextControlEntry(ZLTextKind kind, bool isStart) : myKind(kind), myStart(isStart) {}
 inline ZLTextControlEntry::~ZLTextControlEntry() {}
@@ -297,9 +382,10 @@
 inline ZLTextControlEntryPool::ZLTextControlEntryPool() {}
 inline ZLTextControlEntryPool::~ZLTextControlEntryPool() {}
 
-inline ZLTextHyperlinkControlEntry::ZLTextHyperlinkControlEntry(const char *address) : ZLTextControlEntry((ZLTextKind)*address, true), myLabel(address + 1) {}
+inline ZLTextHyperlinkControlEntry::ZLTextHyperlinkControlEntry(const char *address) : ZLTextControlEntry((ZLTextKind)*address, true), myLabel(address + 1), myHyperlinkType(address + myLabel.length() + 2) {}
 inline ZLTextHyperlinkControlEntry::~ZLTextHyperlinkControlEntry() {}
 inline const std::string &ZLTextHyperlinkControlEntry::label() const { return myLabel; }
+inline const std::string &ZLTextHyperlinkControlEntry::hyperlinkType() const { return myHyperlinkType; }
 inline bool ZLTextHyperlinkControlEntry::isHyperlink() const { return true; }
 
 inline ZLTextEntry::ZLTextEntry(const char *address) : myAddress(address) {}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextRowMemoryAllocator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextRowMemoryAllocator.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextRowMemoryAllocator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextRowMemoryAllocator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextSelectionModel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextSelectionModel.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextSelectionModel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextSelectionModel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,10 +31,24 @@
 
 class ZLTextView;
 class ZLApplication;
+class ZLImageData;
+class ZLTextElementArea;
 
 class ZLTextSelectionModel {
 
 public:
+	struct BoundElement {
+		bool Exists;
+		int ParagraphIndex;
+		int ElementIndex;
+		size_t CharIndex;
+
+		bool operator == (const BoundElement &element) const;
+		bool operator != (const BoundElement &element) const;
+	};
+	typedef std::pair<BoundElement,BoundElement> Range;
+
+public:
 	ZLTextSelectionModel(ZLTextView &view, ZLApplication &application);
 
 	void activate(int x, int y);
@@ -43,19 +57,14 @@
 	void deactivate();
 	void clear();
 
-	const std::string &getText() const;
-	bool isEmpty() const;
+	bool selectWord(int x, int y);
+	void extendWordSelectionToParagraph();
 
-public:
-	struct BoundElement {
-		bool Exists;
-		int ParagraphNumber;
-		int TextElementNumber;
-		size_t CharNumber;
+	const std::string &text() const;
+	shared_ptr<ZLImageData> image() const;
+	const std::vector<Range> &ranges() const;
 
-		bool operator == (const BoundElement &element) const;
-		bool operator != (const BoundElement &element) const;
-	};
+	bool isEmpty() const;
 
 private:
 	struct Bound {
@@ -65,16 +74,19 @@
 		bool operator < (const Bound &bound) const;
 	};
 
-public:
-	std::pair<BoundElement,BoundElement> range() const;
-
 private:
+	int charIndex(const ZLTextElementArea &area, int x);
+
+	Range internalRange() const;
 	void setBound(Bound &bound, int x, int y);
 	void startSelectionScrolling(bool forward);
 	void stopSelectionScrolling();
 
 	void scrollAndExtend();
 
+	void clearData() const;
+	void createData() const;
+
 private:
 	ZLTextView &myView;
 	ZLApplication &myApplication;
@@ -91,8 +103,12 @@
 
 	mutable std::set<ZLTextParagraphCursorPtr> myCursors;
 	mutable std::string myText;
+	mutable shared_ptr<ZLImageData> myImage;
 	mutable bool myTextIsUpToDate;
 
+	mutable std::vector<Range> myRanges;
+	mutable bool myRangeVectorIsUpToDate;
+
 friend class ZLTextSelectionScroller;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextStyle.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextStyle.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextStyle.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextStyle.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 #include <ZLTextKind.h>
 #include <ZLTextAlignmentType.h>
+#include <ZLTextParagraph.h>
 
 class ZLTextStyle {
 
@@ -48,11 +49,11 @@
 
 	virtual ZLColor color() const = 0;
 
-	virtual int spaceBefore() const = 0;
-	virtual int spaceAfter() const = 0;
-	virtual int leftIndent() const = 0;
-	virtual int rightIndent() const = 0;
-	virtual int firstLineIndentDelta() const = 0;
+	virtual short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const = 0;
+	virtual short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const = 0;
+	virtual short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const = 0;
+	virtual short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const = 0;
+	virtual short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const = 0;
 	virtual int verticalShift() const = 0;
 	virtual ZLTextAlignmentType alignment() const = 0;
 	virtual double lineSpace() const = 0;
@@ -79,11 +80,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 
 	ZLTextAlignmentType alignment() const;
@@ -97,10 +98,11 @@
 	ZLColorOption SelectionBackgroundColorOption;
 	ZLColorOption SelectedTextColorOption;
 	ZLColorOption RegularTextColorOption;
-	ZLColorOption InternalHyperlinkTextColorOption;
-	ZLColorOption ExternalHyperlinkTextColorOption;
 	ZLColorOption TreeLinesColorOption;
 
+	bool hasHyperlinkColorOption(const std::string &type);
+	ZLColorOption &hyperlinkColorOption(const std::string &type);
+
 	ZLBooleanOption AutoHyphenationOption;
 
 	ZLStringOption FontFamilyOption;
@@ -110,6 +112,9 @@
 	ZLIntegerOption AlignmentOption;
 	ZLDoubleOption LineSpaceOption;
 	ZLIntegerOption LineSpacePercentOption;
+
+private:
+	std::map<std::string,shared_ptr<ZLColorOption> > myHyperlinkColorOptions;
 };
 
 class ZLTextStyleDecoration {
@@ -124,13 +129,8 @@
 
 	const std::string &name() const;
 
-	enum HyperlinkStyle {
-		NONE,
-		INTERNAL,
-		EXTERNAL
-	};
-	HyperlinkStyle hyperlinkStyle() const;
-	void setHyperlinkStyle(HyperlinkStyle hyperlinkStyle);
+	const std::string &hyperlinkStyle() const;
+	void setHyperlinkStyle(const std::string &hyperlinkStyle);
 
 public:
 	ZLStringOption FontFamilyOption;
@@ -145,13 +145,13 @@
 private:
 	std::string myName;
 
-	HyperlinkStyle myHyperlinkStyle;
+	std::string myHyperlinkStyle;
 };
 
 class ZLTextFullStyleDecoration : public ZLTextStyleDecoration {
 
 public:
-	ZLTextFullStyleDecoration(const std::string &name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, int spaceBefore, int spaceAfter, int leftIndent, int rightIndent, int firstLineIndentDelta, int verticalShift, ZLTextAlignmentType alignment, double lineSpace, ZLBoolean3 allowHyphenations);
+	ZLTextFullStyleDecoration(const std::string &name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, short spaceBefore, short spaceAfter, short lineStartIndent, short lineEndIndent, short firstLineIndentDelta, int verticalShift, ZLTextAlignmentType alignment, double lineSpace, ZLBoolean3 allowHyphenations);
 	~ZLTextFullStyleDecoration();
 
 	virtual bool isFullDecoration() const;
@@ -161,8 +161,8 @@
 public:
 	ZLIntegerRangeOption SpaceBeforeOption;
 	ZLIntegerRangeOption SpaceAfterOption;
-	ZLIntegerRangeOption LeftIndentOption;
-	ZLIntegerRangeOption RightIndentOption;
+	ZLIntegerRangeOption LineStartIndentOption;
+	ZLIntegerRangeOption LineEndIndentOption;
 	ZLIntegerRangeOption FirstLineIndentDeltaOption;
 
 	ZLIntegerOption AlignmentOption;
@@ -186,12 +186,12 @@
 	const ZLTextStylePtr myBase;
 };
 
-class ZLTextForcedControlEntry;
+class ZLTextStyleEntry;
 
 class ZLTextForcedStyle : public ZLTextDecoratedStyle {
 
 public:
-	ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextForcedControlEntry &entry);
+	ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextStyleEntry &entry);
 	~ZLTextForcedStyle();
 
 	const std::string &fontFamily() const;
@@ -202,11 +202,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 	ZLTextAlignmentType alignment() const;
 	double lineSpace() const;
@@ -214,7 +214,7 @@
 	bool allowHyphenations() const;
 
 private:
-	const ZLTextForcedControlEntry &myEntry;
+	const ZLTextStyleEntry &myEntry;
 };
 
 class ZLTextPartialDecoratedStyle : public ZLTextDecoratedStyle {
@@ -232,11 +232,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 
 	ZLTextAlignmentType alignment() const;
@@ -263,11 +263,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 
 	ZLTextAlignmentType alignment() const;
@@ -287,7 +287,13 @@
 public:
 	virtual ~ZLTextPositionIndicatorInfo();
 
-	virtual bool isVisible() const = 0;
+	enum Type {
+		OS_SCROLLBAR = 0,
+		FB_INDICATOR = 1,
+		NONE = 2
+	};
+
+	virtual Type type() const = 0;
 	virtual bool isSensitive() const = 0;
 	virtual bool isTextPositionShown() const = 0;
 	virtual bool isTimeShown() const = 0;
@@ -311,6 +317,8 @@
 	ZLTextBaseStyle &baseStyle() const;
 	ZLTextStyleDecoration *decoration(ZLTextKind kind) const;
 
+	ZLBooleanOption OverrideSpecifiedFontsOption;
+
 private:
 	ZLTextStyleCollection();
 	~ZLTextStyleCollection();
@@ -327,6 +335,7 @@
 
 inline ZLTextStyle::ZLTextStyle() {}
 inline ZLTextStyle::~ZLTextStyle() {}
+
 inline int ZLTextStyle::lineSpacePercent() const { return (int)(lineSpace() * 100); }
 
 inline bool ZLTextBaseStyle::isDecorated() const { return false; }
@@ -334,11 +343,11 @@
 inline int ZLTextBaseStyle::fontSize() const { return FontSizeOption.value(); }
 inline bool ZLTextBaseStyle::bold() const { return BoldOption.value(); }
 inline bool ZLTextBaseStyle::italic() const { return ItalicOption.value(); }
-inline int ZLTextBaseStyle::spaceBefore() const { return 0; }
-inline int ZLTextBaseStyle::spaceAfter() const { return 0; }
-inline int ZLTextBaseStyle::leftIndent() const { return 0; }
-inline int ZLTextBaseStyle::rightIndent() const { return 0; }
-inline int ZLTextBaseStyle::firstLineIndentDelta() const { return 0; }
+inline short ZLTextBaseStyle::spaceBefore(const ZLTextStyleEntry::Metrics&) const { return 0; }
+inline short ZLTextBaseStyle::spaceAfter(const ZLTextStyleEntry::Metrics&) const { return 0; }
+inline short ZLTextBaseStyle::lineStartIndent(const ZLTextStyleEntry::Metrics&, bool) const { return 0; }
+inline short ZLTextBaseStyle::lineEndIndent(const ZLTextStyleEntry::Metrics&, bool) const { return 0; }
+inline short ZLTextBaseStyle::firstLineIndentDelta(const ZLTextStyleEntry::Metrics&) const { return 0; }
 inline int ZLTextBaseStyle::verticalShift() const { return 0; }
 inline ZLTextAlignmentType ZLTextBaseStyle::alignment() const { return (ZLTextAlignmentType)AlignmentOption.value(); }
 inline double ZLTextBaseStyle::lineSpace() const { return LineSpacePercentOption.value() / 100.0; }
@@ -347,8 +356,6 @@
 inline ZLTextStyleDecoration::~ZLTextStyleDecoration() {}
 inline bool ZLTextStyleDecoration::isFullDecoration() const { return false; }
 inline const std::string &ZLTextStyleDecoration::name() const { return myName; }
-inline ZLTextStyleDecoration::HyperlinkStyle ZLTextStyleDecoration::hyperlinkStyle() const { return myHyperlinkStyle; }
-inline void ZLTextStyleDecoration::setHyperlinkStyle(HyperlinkStyle hyperlinkStyle) { myHyperlinkStyle = hyperlinkStyle; }
 
 inline ZLTextFullStyleDecoration::~ZLTextFullStyleDecoration() {}
 inline bool ZLTextFullStyleDecoration::isFullDecoration() const { return true; }
@@ -358,37 +365,30 @@
 inline bool ZLTextDecoratedStyle::isDecorated() const { return true; }
 inline const ZLTextStylePtr ZLTextDecoratedStyle::base() const { return myBase; }
 
-inline ZLTextForcedStyle::ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextForcedControlEntry &entry) : ZLTextDecoratedStyle(base), myEntry(entry) {}
+inline ZLTextForcedStyle::ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextStyleEntry &entry) : ZLTextDecoratedStyle(base), myEntry(entry) {}
 inline ZLTextForcedStyle::~ZLTextForcedStyle() {}
-inline const std::string &ZLTextForcedStyle::fontFamily() const { return base()->fontFamily(); }
-inline int ZLTextForcedStyle::fontSize() const { return base()->fontSize(); }
-inline bool ZLTextForcedStyle::bold() const { return base()->bold(); }
-inline bool ZLTextForcedStyle::italic() const { return base()->italic(); }
 inline ZLColor ZLTextForcedStyle::color() const { return base()->color(); }
-inline int ZLTextForcedStyle::spaceBefore() const { return base()->spaceBefore(); }
-inline int ZLTextForcedStyle::spaceAfter() const { return base()->spaceAfter(); }
-inline int ZLTextForcedStyle::firstLineIndentDelta() const { return base()->firstLineIndentDelta(); }
 inline int ZLTextForcedStyle::verticalShift() const { return base()->verticalShift(); }
 inline double ZLTextForcedStyle::lineSpace() const { return base()->lineSpace(); }
 inline bool ZLTextForcedStyle::allowHyphenations() const { return base()->allowHyphenations(); }
 
 inline ZLTextPartialDecoratedStyle::ZLTextPartialDecoratedStyle(const ZLTextStylePtr base, const ZLTextStyleDecoration &decoration) : ZLTextDecoratedStyle(base), myDecoration(decoration) {}
 inline ZLTextPartialDecoratedStyle::~ZLTextPartialDecoratedStyle() {}
-inline int ZLTextPartialDecoratedStyle::spaceBefore() const { return base()->spaceBefore(); }
-inline int ZLTextPartialDecoratedStyle::spaceAfter() const { return base()->spaceAfter(); }
-inline int ZLTextPartialDecoratedStyle::leftIndent() const { return base()->leftIndent(); }
-inline int ZLTextPartialDecoratedStyle::rightIndent() const { return base()->rightIndent(); }
-inline int ZLTextPartialDecoratedStyle::firstLineIndentDelta() const { return base()->firstLineIndentDelta(); }
+inline short ZLTextPartialDecoratedStyle::spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const { return base()->spaceBefore(metrics); }
+inline short ZLTextPartialDecoratedStyle::spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const { return base()->spaceAfter(metrics); }
+inline short ZLTextPartialDecoratedStyle::lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineStartIndent(metrics, rtl); }
+inline short ZLTextPartialDecoratedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineEndIndent(metrics, rtl); }
+inline short ZLTextPartialDecoratedStyle::firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const { return base()->firstLineIndentDelta(metrics); }
 inline int ZLTextPartialDecoratedStyle::verticalShift() const { return base()->verticalShift() + myDecoration.VerticalShiftOption.value(); }
 inline ZLTextAlignmentType ZLTextPartialDecoratedStyle::alignment() const { return base()->alignment(); }
 inline double ZLTextPartialDecoratedStyle::lineSpace() const { return base()->lineSpace(); }
 
 inline ZLTextFullDecoratedStyle::ZLTextFullDecoratedStyle(const ZLTextStylePtr base, const ZLTextFullStyleDecoration &decoration) : ZLTextDecoratedStyle(base), myDecoration(decoration) {}
 inline ZLTextFullDecoratedStyle::~ZLTextFullDecoratedStyle() {}
-inline int ZLTextFullDecoratedStyle::spaceBefore() const { return myDecoration.SpaceBeforeOption.value(); }
-inline int ZLTextFullDecoratedStyle::spaceAfter() const { return myDecoration.SpaceAfterOption.value(); }
-inline int ZLTextFullDecoratedStyle::leftIndent() const { return base()->leftIndent() + myDecoration.LeftIndentOption.value(); }
-inline int ZLTextFullDecoratedStyle::rightIndent() const { return base()->rightIndent() + myDecoration.RightIndentOption.value(); }
+inline short ZLTextFullDecoratedStyle::spaceBefore(const ZLTextStyleEntry::Metrics&) const { return myDecoration.SpaceBeforeOption.value(); }
+inline short ZLTextFullDecoratedStyle::spaceAfter(const ZLTextStyleEntry::Metrics&) const { return myDecoration.SpaceAfterOption.value(); }
+inline short ZLTextFullDecoratedStyle::lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineStartIndent(metrics, rtl) + myDecoration.LineStartIndentOption.value(); }
+inline short ZLTextFullDecoratedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineEndIndent(metrics, rtl) + myDecoration.LineEndIndentOption.value(); }
 inline int ZLTextFullDecoratedStyle::verticalShift() const { return base()->verticalShift() + myDecoration.VerticalShiftOption.value(); }
 inline double ZLTextFullDecoratedStyle::lineSpace() const {
 	const int spacing = myDecoration.LineSpacePercentOption.value();
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextStyleOptions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextStyleOptions.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextStyleOptions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextStyleOptions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextTeXHyphenator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextTeXHyphenator.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextTeXHyphenator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextTeXHyphenator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 class ZLTextTeXHyphenationPattern {
 
 public:
-	ZLTextTeXHyphenationPattern(unsigned short *ucs2String, int length);
+	ZLTextTeXHyphenationPattern(ZLUnicodeUtil::Ucs4Char *ucs4String, int length);
 	ZLTextTeXHyphenationPattern(const std::string &utf8String);
 	~ZLTextTeXHyphenationPattern();
 
@@ -37,7 +37,7 @@
 
 private:
 	int myLength;
-	unsigned short *mySymbols;
+	ZLUnicodeUtil::Ucs4Char *mySymbols;
 	unsigned char *myValues;
 
 friend class ZLTextTeXPatternComparator;
@@ -62,7 +62,7 @@
 	const std::string &language() const;
 
 protected:
-	void hyphenate(std::vector<unsigned short> &ucs2String, std::vector<unsigned char> &mask, int length) const;
+	void hyphenate(ZLUnicodeUtil::Ucs4String &ucs4String, std::vector<unsigned char> &mask, int length) const;
 
 private:
 	typedef std::vector<ZLTextTeXHyphenationPattern*>::const_iterator PatternIterator;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextView.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include <string>
 #include <algorithm>
 
+#include <ZLTime.h>
 #include <ZLOptions.h>
 #include <ZLView.h>
 #include <ZLDialogManager.h>
@@ -34,6 +35,7 @@
 #include <ZLTextParagraphCursor.h>
 #include <ZLTextSelectionModel.h>
 #include <ZLTextArea.h>
+#include <ZLTextParagraph.h>
 
 class ZLTextModel;
 class ZLTextMark;
@@ -81,15 +83,17 @@
 		std::string timeString() const;
 		size_t sizeOfParagraph(size_t paragraphNumber) const;
 		size_t sizeOfTextBeforeParagraph(size_t paragraphNumber) const;
-		size_t sizeOfTextBeforeCursor() const;
+		size_t sizeOfTextBeforeCursor(const ZLTextWordCursor &cursor) const;
 
 	private:
 		ZLTextView &myTextView;
 		const ZLTextPositionIndicatorInfo &myInfo;
 		int myExtraWidth;
+
+	friend class ZLTextView;
 	};
 
-	friend class ZLTextView::PositionIndicator;
+friend class ZLTextView::PositionIndicator;
 	
 private:
 	class ViewStyle {
@@ -100,23 +104,38 @@
 		void setPaintContext(shared_ptr<ZLPaintContext> context);
 
 		void reset();
-		void setTextStyle(const ZLTextStylePtr style);
+		void setTextStyle(const ZLTextStylePtr style, unsigned char bidiLevel);
+
+	private:
 		void applyControl(const ZLTextControlElement &control);
-		void applyControl(const ZLTextForcedControlElement &control);
+		void applyControl(const ZLTextStyleElement &control);
+		void increaseBidiLevel();
+		void decreaseBidiLevel();
+
+	public:
+		void applySingleControl(const ZLTextElement &element);
 		void applyControls(const ZLTextWordCursor &begin, const ZLTextWordCursor &end);
 
 		const ZLPaintContext &context() const;
 		const ZLTextStylePtr textStyle() const;
-		int elementWidth(const ZLTextElement &element, unsigned int charNumber) const;
-		int elementHeight(const ZLTextElement &element) const;
+		int elementWidth(const ZLTextElement &element, unsigned int charNumber, const ZLTextStyleEntry::Metrics &metrics) const;
+		int elementHeight(const ZLTextElement &element, const ZLTextStyleEntry::Metrics &metrics) const;
 		int elementDescent(const ZLTextElement &element) const;
 
 		int wordWidth(const ZLTextWord &word, int start = 0, int length = -1, bool addHyphenationSign = false) const;
 
+		void setBaseBidiLevel(unsigned char base);
+		unsigned char baseBidiLevel() const;
+		bool baseIsRtl() const;
+		
+		unsigned char bidiLevel() const;
+
 	private:
 		ZLTextStylePtr myTextStyle;
 		shared_ptr<ZLPaintContext> myContext;
 		mutable int myWordHeight;
+		unsigned char myBaseBidiLevel;
+		unsigned char myBidiLevel;
 	};
 
 protected:
@@ -127,8 +146,10 @@
 
 public:
 	void clearCaches();
+	void forceScrollbarUpdate();
 
 	void gotoPage(size_t index);
+	size_t pageIndex();
 	size_t pageNumber() const;
 
 	void scrollPage(bool forward, ScrollingMode mode, unsigned int value);
@@ -136,13 +157,13 @@
 	void scrollToEndOfText();
 
 	void gotoMark(ZLTextMark mark);
-	virtual void gotoParagraph(int num, bool last = false);
+	virtual void gotoParagraph(int num, bool end = false);
 	void gotoPosition(int paragraphNumber, int wordNumber, int charNumber);
 
 	const ZLTextWordCursor &startCursor() const;
 	const ZLTextWordCursor &endCursor() const;
 
-	virtual void setModel(shared_ptr<ZLTextModel> model);
+	virtual void setModel(shared_ptr<ZLTextModel> model, const std::string &language);
 	const shared_ptr<ZLTextModel> model() const;
 
 	bool hasMultiSectionModel() const;
@@ -155,18 +176,26 @@
 	void highlightParagraph(int paragraphNumber);
 
 	ZLTextSelectionModel &selectionModel();
+	const ZLTextSelectionModel &selectionModel() const;
 	void copySelectedTextToClipboard(ZLDialogManager::ClipboardType type) const;
-	
+
+	virtual bool isSelectionEnabled() const = 0;
+
 protected:
 	bool onStylusPress(int x, int y);
+	bool onStylusMove(int x, int y);
 	bool onStylusMovePressed(int x, int y);
 	bool onStylusRelease(int x, int y);
+	virtual bool onStylusClick(int x, int y, int count);
+	void onScrollbarMoved(Direction direction, size_t full, size_t from, size_t to);
+	void onScrollbarStep(Direction direction, int steps);
+	void onScrollbarPageStep(Direction direction, int steps);
 	void activateSelection(int x, int y);
 
 	virtual void paint();
 
-	int paragraphIndexByCoordinate(int y) const;
 	const ZLTextElementArea *elementByCoordinates(int x, int y) const;
+	int paragraphIndexByCoordinates(int x, int y) const;
 
 	void rebuildPaintInfo(bool strong);
 	virtual void preparePaintInfo();
@@ -181,21 +210,25 @@
 	virtual int rightMargin() const = 0;
 	virtual int topMargin() const = 0;
 	virtual int bottomMargin() const = 0;
-	virtual bool isSelectionEnabled() const = 0;
 
 private:
+	int lineStartMargin() const;
+	int lineEndMargin() const;
+	int visualX(int logicalX) const;
+
 	void moveStartCursor(int paragraphNumber, int wordNumber = 0, int charNumber = 0);
 	void moveEndCursor(int paragraphNumber, int wordNumber = 0, int charNumber = 0);
 
 	void clear();
 
-	int areaLength(const ZLTextParagraphCursor &paragraph, const ZLTextElementArea &area, int toCharNumber);
+	int areaBound(const ZLTextParagraphCursor &paragraph, const ZLTextElementArea &area, int toCharNumber, bool mainDir);
 	ZLTextLineInfoPtr processTextLine(const ZLTextWordCursor &start, const ZLTextWordCursor &end);
-	void prepareTextLine(const ZLTextLineInfo &info);
-	void drawTextLine(const ZLTextLineInfo &info, size_t from, size_t to);
+	void prepareTextLine(const ZLTextLineInfo &info, int y);
+	void drawTextLine(const ZLTextLineInfo &info, int y, size_t from, size_t to);
+	void drawSelectionRectangle(int left, int top, int right, int bottom);
 	void drawWord(int x, int y, const ZLTextWord &word, int start, int length, bool addHyphenationSign);
-	void drawString(int x, int y, const char *str, int len, const ZLTextWord::Mark *mark, int shift);
-	void drawTreeLines(const ZLTextTreeNodeInfo &info, int height, int vSpaceAfter);
+	void drawString(int x, int y, const char *str, int len, const ZLTextWord::Mark *mark, int shift, bool rtl);
+	void drawTreeLines(const ZLTextTreeNodeInfo &info, int x, int y, int height, int vSpaceAfter);
 
 	bool pageIsEmpty() const;
 	ZLTextWordCursor findLineFromStart(unsigned int overlappingValue) const;
@@ -221,8 +254,14 @@
 	int viewHeight() const;
 	int textAreaHeight() const;
 
+	void addAreaToTextMap(const ZLTextElementArea &area);
+	void flushRevertedElements(unsigned char bidiLevel);
+
+	void gotoCharIndex(size_t charIndex);
+
 private:
 	shared_ptr<ZLTextModel> myModel;
+	std::string myLanguage;
 
 	enum {
 		NOTHING_TO_PAINT,
@@ -243,6 +282,7 @@
 	int myOldWidth, myOldHeight;
 
 	ZLTextElementMap myTextElementMap;
+	std::vector<ZLTextElementMap> myTextElementsToRevert;
 	ZLTextTreeNodeMap myTreeNodeMap;
 
 	std::vector<size_t> myTextSize;
@@ -254,6 +294,17 @@
 	shared_ptr<PositionIndicator> myPositionIndicator;
 
 	bool myTreeStateIsFrozen;
+	bool myDoUpdateScrollbar;
+
+	struct DoubleClickInfo {
+		DoubleClickInfo();
+		void update(int x, int y, bool press);
+
+		int Count;
+		ZLTime Time;
+		int X;
+		int Y;
+	} myDoubleClickInfo;
 
 friend class ZLTextSelectionModel;
 };
@@ -261,12 +312,19 @@
 inline ZLTextView::ViewStyle::~ViewStyle() {}
 inline const ZLPaintContext &ZLTextView::ViewStyle::context() const { return *myContext; }
 inline const ZLTextStylePtr ZLTextView::ViewStyle::textStyle() const { return myTextStyle; }
+inline void ZLTextView::ViewStyle::setBaseBidiLevel(unsigned char base) { myBaseBidiLevel = base; myBidiLevel = base; }
+inline unsigned char ZLTextView::ViewStyle::baseBidiLevel() const { return myBaseBidiLevel; }
+inline bool ZLTextView::ViewStyle::baseIsRtl() const { return myBaseBidiLevel % 2 == 1; }
+inline void ZLTextView::ViewStyle::increaseBidiLevel() { ++myBidiLevel; }
+inline void ZLTextView::ViewStyle::decreaseBidiLevel() { if (myBidiLevel > myBaseBidiLevel) --myBidiLevel; }
+inline unsigned char ZLTextView::ViewStyle::bidiLevel() const { return myBidiLevel; }
 
 inline bool ZLTextView::empty() const { return myPaintState == NOTHING_TO_PAINT; }
 inline const ZLTextWordCursor &ZLTextView::startCursor() const { return myStartCursor; }
 inline const ZLTextWordCursor &ZLTextView::endCursor() const { return myEndCursor; }
 inline const shared_ptr<ZLTextModel> ZLTextView::model() const { return myModel; }
 inline ZLTextSelectionModel &ZLTextView::selectionModel() { return mySelectionModel; }
+inline const ZLTextSelectionModel &ZLTextView::selectionModel() const { return mySelectionModel; }
 
 inline int ZLTextView::viewWidth() const {
 	return std::max(myStyle.context().width() - leftMargin() - rightMargin(), 1);
@@ -276,4 +334,16 @@
 	return std::max(myStyle.context().height() - topMargin() - bottomMargin(), 1);
 }
 
+inline int ZLTextView::visualX(int logicalX) const {
+	return myStyle.baseIsRtl() ? context().width() - logicalX - 1 : logicalX;
+}
+
+inline int ZLTextView::lineStartMargin() const {
+	return myStyle.baseIsRtl() ? rightMargin() : leftMargin();
+}
+
+inline int ZLTextView::lineEndMargin() const {
+	return myStyle.baseIsRtl() ? leftMargin() : rightMargin();
+}
+
 #endif /* __ZLTEXTVIEW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/include/ZLTextWord.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextWord.h
--- fbreader-0.8.17/zlibrary/text/include/ZLTextWord.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/include/ZLTextWord.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 	};
 
 private:
-	ZLTextWord(const char *data, unsigned short size, size_t paragraphOffset);
+	ZLTextWord(const char *data, unsigned short size, size_t paragraphOffset, unsigned char bidiLevel);
 	~ZLTextWord();
 
 public:
@@ -67,6 +67,7 @@
 	/* number of characters */
 	const unsigned short Length;
 	const size_t ParagraphOffset;
+	const unsigned char BidiLevel;
 
 private:
 	Mark *myMark;
@@ -84,7 +85,7 @@
 inline ZLTextWord::Mark *ZLTextWord::mark() const { return myMark; }
 inline short ZLTextWord::width(const ZLPaintContext &context) const {
 	if (myWidth == -1) {
-		myWidth = context.stringWidth(Data, Size);
+		myWidth = context.stringWidth(Data, Size, BidiLevel % 2 == 1);
 	}
 	return myWidth;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/Makefile /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/Makefile
--- fbreader-0.8.17/zlibrary/text/Makefile	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/Makefile	2009-04-30 22:26:45.000000000 +0100
@@ -3,12 +3,18 @@
 include $(MAKEFILESDIR)/config.mk
 
 VERSION = $(shell cat ../VERSION)
-SOVERSION = $(shell cat ../SOVERSION)
+SOVERSION = $(shell cat SOVERSION)
 
 ifeq "$(ZLSHARED)" "yes"
-  TARGET = libzltext.so.$(VERSION)
-  TARGET_SONAME = libzltext.so.$(SOVERSION)
-  TARGET_SHORTNAME = libzltext.so
+  ifeq "$(TARGET_ARCH)" "macosx"
+    TARGET = libzltext.$(VERSION).dylib
+    TARGET_SONAME = libzltext.$(SOVERSION).dylib
+    TARGET_SHORTNAME = libzltext.dylib
+  else
+    TARGET = libzltext.so.$(VERSION)
+    TARGET_SONAME = libzltext.so.$(SOVERSION)
+    TARGET_SHORTNAME = libzltext.so
+  endif
 else
   TARGET = libzltext.a
 endif
@@ -25,16 +31,17 @@
 	done;
 
 $(TARGET): .objects
-	@echo -n "Creating $@ ..."
+	@echo -n 'Creating $@ ...'
 	@$(RM_QUIET) $(TARGET)
 ifeq "$(ZLSHARED)" "yes"
-	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -llinebreak
+	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) -llinebreak -lfribidi
+	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET_SONAME) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS)) $(CORE_LIBS) $(EXTERNAL_LIBS) -llinebreak -lfribidi
 	@ln -sf $(TARGET) $(TARGET_SONAME)
 	@ln -sf $(TARGET) $(TARGET_SHORTNAME)
 else
 	@$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS))
 endif
-	@echo " OK"
+	@echo ' OK'
 
 SHARE_ZLIBRARY = $(DESTDIR)$(SHAREDIR)/zlibrary
 
@@ -63,4 +70,4 @@
 			$(MAKE) -C $$subdir -f $(MAKEFILESDIR)/subdir.mk clean; \
 		fi; \
 	done;
-	@$(RM) *.so *.so.* *.a
+	@$(RM) *.so *.so.* *.dylib *.a
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/SOVERSION /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/SOVERSION
--- fbreader-0.8.17/zlibrary/text/SOVERSION	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/text/SOVERSION	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+0.10
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.cpp
--- fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include "ZLTextHyphenationReader.h"
 #include "ZLTextTeXHyphenator.h"
 
-void ZLTextHyphenationReader::characterDataHandler(const char *text, int len) {
+void ZLTextHyphenationReader::characterDataHandler(const char *text, size_t len) {
 	if (myReadPattern) {
 		myBuffer.append(text, len);
 	}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.h
--- fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenationReader.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 
 	void startElementHandler(const char *tag, const char **attributes);
 	void endElementHandler(const char *tag);
-	void characterDataHandler(const char *text, int len);
+	void characterDataHandler(const char *text, size_t len);
 
 private:
 	ZLTextTeXHyphenator *myHyphenator;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenator.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenator.cpp
--- fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenator.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenator.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,6 @@
  * 02110-1301, USA.
  */
 
-#include <ZLUnicodeUtil.h>
 #include <ZLTextWord.h>
 
 #include "ZLTextHyphenator.h"
@@ -33,10 +32,10 @@
 }
 
 ZLTextHyphenationInfo ZLTextHyphenator::info(const ZLTextWord &word) const {
-	ZLUnicodeUtil::Ucs2String ucs2Vector;
-	ZLUnicodeUtil::utf8ToUcs2(ucs2Vector, word.Data, word.Size, word.Length);
+	ZLUnicodeUtil::Ucs4String ucs4Vector;
+	ZLUnicodeUtil::utf8ToUcs4(ucs4Vector, word.Data, word.Size, word.Length);
 
-	static std::vector<unsigned short> pattern;
+	ZLUnicodeUtil::Ucs4String pattern;
 	pattern.clear();
 	pattern.reserve(word.Length + 2);
 
@@ -45,9 +44,10 @@
 	isLetter.reserve(word.Length);
 
 	pattern.push_back(' ');
-	for (unsigned int i = 0; i < ucs2Vector.size(); ++i) {
-		unsigned short symbol = ucs2Vector[i];
-		bool letter = ZLUnicodeUtil::isLetter(symbol);
+	for (unsigned int i = 0; i < ucs4Vector.size(); ++i) {
+		ZLUnicodeUtil::Ucs4Char symbol = ucs4Vector[i];
+		// TODO: get special symbols from pattern file
+		bool letter = (symbol == '\'') || (symbol == '^') || ZLUnicodeUtil::isLetter(symbol);
 		isLetter.push_back(letter);
 		pattern.push_back(letter ? ZLUnicodeUtil::toLower(symbol) : ' ');
 	}
@@ -59,12 +59,12 @@
 	for (int i = 0; i < word.Length + 1; ++i) {
 		if ((i < 2) || (i > word.Length - 2)) {
 			info.myMask[i] = false;
-		} else if (ucs2Vector[i - 1] == '-') {
+		} else if (ucs4Vector[i - 1] == '-') {
 			info.myMask[i] = (i >= 3) &&
-				(isLetter[i - 3] || (ucs2Vector[i - 3] == '-')) &&
-				(isLetter[i - 2] || (ucs2Vector[i - 2] == '-')) &&
-				(isLetter[i] || (ucs2Vector[i] == '-')) &&
-				(isLetter[i + 1] || (ucs2Vector[i + 1] == '-'));
+				(isLetter[i - 3] || (ucs4Vector[i - 3] == '-')) &&
+				(isLetter[i - 2] || (ucs4Vector[i - 2] == '-')) &&
+				(isLetter[i] || (ucs4Vector[i] == '-')) &&
+				(isLetter[i + 1] || (ucs4Vector[i + 1] == '-'));
 		} else {
 			info.myMask[i] = info.myMask[i] &&
 				isLetter[i - 2] &&
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenator.h
--- fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextHyphenator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextHyphenator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 
 #include <string>
 
+#include <ZLUnicodeUtil.h>
+
 class ZLTextWord;
 
 class ZLTextHyphenationInfo {
@@ -59,7 +61,7 @@
 	ZLTextHyphenationInfo info(const ZLTextWord &word) const;
 
 protected:
-	virtual void hyphenate(std::vector<unsigned short> &ucs2String, std::vector<unsigned char> &mask, int length) const = 0;
+	virtual void hyphenate(ZLUnicodeUtil::Ucs4String &ucs4String, std::vector<unsigned char> &mask, int length) const = 0;
 
 protected:
 	static ZLTextHyphenator *ourInstance;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.cpp
--- fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 #include <algorithm>
 #include <vector>
 
-#include <ZLUnicodeUtil.h>
 #include <ZLStringUtil.h>
 #include <ZLFile.h>
 #include <ZLDir.h>
@@ -45,34 +44,34 @@
 	return ZLibrary::ZLibraryDirectory() + ZLibrary::FileNameDelimiter + "hyphenationPatterns.zip";
 }
 
-ZLTextTeXHyphenationPattern::ZLTextTeXHyphenationPattern(unsigned short *ucs2String, int length) {
+ZLTextTeXHyphenationPattern::ZLTextTeXHyphenationPattern(ZLUnicodeUtil::Ucs4Char *ucs4String, int length) {
 	myLength = length;
-	mySymbols = ucs2String;
+	mySymbols = ucs4String;
 	myValues = NULL;
 }
 
 ZLTextTeXHyphenationPattern::ZLTextTeXHyphenationPattern(const std::string &utf8String) {
 	myLength = 0;
 
-	ZLUnicodeUtil::Ucs2String ucs2String;
-	ZLUnicodeUtil::utf8ToUcs2(ucs2String, utf8String);
+	ZLUnicodeUtil::Ucs4String ucs4String;
+	ZLUnicodeUtil::utf8ToUcs4(ucs4String, utf8String);
 
-	const int len = ucs2String.size();
+	const int len = ucs4String.size();
 	for (int i = 0; i < len; ++i) {
-		if ((ucs2String[i] < '0') || (ucs2String[i] > '9')) {
+		if ((ucs4String[i] < '0') || (ucs4String[i] > '9')) {
 			++myLength;
 		}
 	}
 
-	mySymbols = new unsigned short[myLength];
+	mySymbols = new ZLUnicodeUtil::Ucs4Char[myLength];
 	myValues = new unsigned char[myLength + 1];
 
 	myValues[0] = 0;
 	for (int j = 0, k = 0; j < len; ++j) {
-		if ((ucs2String[j] >= '0') && (ucs2String[j] <= '9')) {
-			myValues[k] = ucs2String[j] - '0';
+		if ((ucs4String[j] >= '0') && (ucs4String[j] <= '9')) {
+			myValues[k] = ucs4String[j] - '0';
 		} else {
-			mySymbols[k] = ucs2String[j];
+			mySymbols[k] = ucs4String[j];
 			++k;
 			myValues[k] = 0;
 		}
@@ -97,8 +96,8 @@
 bool ZLTextTeXPatternComparator::operator() (const ZLTextTeXHyphenationPattern *p1, const ZLTextTeXHyphenationPattern *p2) const {
 	bool firstIsShorter = p1->myLength < p2->myLength;
 	int minLength = firstIsShorter ? p1->myLength : p2->myLength;
-	unsigned short *symbols1 = p1->mySymbols;
-	unsigned short *symbols2 = p2->mySymbols;
+	const ZLUnicodeUtil::Ucs4Char *symbols1 = p1->mySymbols;
+	const ZLUnicodeUtil::Ucs4Char *symbols2 = p2->mySymbols;
 	for (int i = 0; i < minLength; ++i) {
 		if (symbols1[i] < symbols2[i]) {
 			return true;
@@ -112,7 +111,7 @@
 static std::vector<unsigned char> values;
 static ZLTextTeXPatternComparator comparator = ZLTextTeXPatternComparator();
 
-void ZLTextTeXHyphenator::hyphenate(std::vector<unsigned short> &ucs2String, std::vector<unsigned char> &mask, int length) const {
+void ZLTextTeXHyphenator::hyphenate(ZLUnicodeUtil::Ucs4String &ucs4String, std::vector<unsigned char> &mask, int length) const {
 	if (myPatternTable.empty()) {
 		for (int i = 0; i < length - 1; ++i) {
 			mask[i] = false;
@@ -125,7 +124,7 @@
 	for (int j = 0; j < length - 2; ++j) {
 		ZLTextTeXHyphenator::PatternIterator dictionaryPattern = myPatternTable.begin();
 		for (int k = 1; k <= length - j; ++k) {
-			ZLTextTeXHyphenationPattern pattern(&ucs2String[j], k);
+			ZLTextTeXHyphenationPattern pattern(&ucs4String[j], k);
 			if (comparator(&pattern, *dictionaryPattern)) {
 				continue;
 			}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.h
--- fbreader-0.8.17/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/hyphenation/ZLTextTeXHyphenator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 class ZLTextTeXHyphenationPattern {
 
 public:
-	ZLTextTeXHyphenationPattern(unsigned short *ucs2String, int length);
+	ZLTextTeXHyphenationPattern(ZLUnicodeUtil::Ucs4Char *ucs4String, int length);
 	ZLTextTeXHyphenationPattern(const std::string &utf8String);
 	~ZLTextTeXHyphenationPattern();
 
@@ -37,7 +37,7 @@
 
 private:
 	int myLength;
-	unsigned short *mySymbols;
+	ZLUnicodeUtil::Ucs4Char *mySymbols;
 	unsigned char *myValues;
 
 friend class ZLTextTeXPatternComparator;
@@ -62,7 +62,7 @@
 	const std::string &language() const;
 
 protected:
-	void hyphenate(std::vector<unsigned short> &ucs2String, std::vector<unsigned char> &mask, int length) const;
+	void hyphenate(ZLUnicodeUtil::Ucs4String &ucs4String, std::vector<unsigned char> &mask, int length) const;
 
 private:
 	typedef std::vector<ZLTextTeXHyphenationPattern*>::const_iterator PatternIterator;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextAlignmentType.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextAlignmentType.h
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextAlignmentType.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextAlignmentType.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextKind.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextKind.h
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextKind.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextKind.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextMark.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextMark.h
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextMark.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextMark.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +21,11 @@
 #define __ZLTEXTMARK_H__
 
 struct ZLTextMark {
-	int ParagraphNumber;
+	int ParagraphIndex;
 	int Offset, Length;
 
 	ZLTextMark();
-	ZLTextMark(int paragraphNumber, int offset, int length);
+	ZLTextMark(int paragraphIndex, int offset, int length);
 	ZLTextMark(const ZLTextMark &mark);
 	const ZLTextMark &operator = (const ZLTextMark &mark);
 	~ZLTextMark();
@@ -36,11 +36,11 @@
 	bool operator >= (const ZLTextMark &mark) const;
 };
 
-inline ZLTextMark::ZLTextMark() : ParagraphNumber(-1), Offset(-1), Length(-1) {}
-inline ZLTextMark::ZLTextMark(int paragraphNumber, int offset, int length) : ParagraphNumber(paragraphNumber), Offset(offset), Length(length) {}
-inline ZLTextMark::ZLTextMark(const ZLTextMark &mark) : ParagraphNumber(mark.ParagraphNumber), Offset(mark.Offset), Length(mark.Length) {}
+inline ZLTextMark::ZLTextMark() : ParagraphIndex(-1), Offset(-1), Length(-1) {}
+inline ZLTextMark::ZLTextMark(int paragraphIndex, int offset, int length) : ParagraphIndex(paragraphIndex), Offset(offset), Length(length) {}
+inline ZLTextMark::ZLTextMark(const ZLTextMark &mark) : ParagraphIndex(mark.ParagraphIndex), Offset(mark.Offset), Length(mark.Length) {}
 inline const ZLTextMark &ZLTextMark::operator = (const ZLTextMark &mark) {
-	ParagraphNumber = mark.ParagraphNumber;
+	ParagraphIndex = mark.ParagraphIndex;
 	Offset = mark.Offset;
 	Length = mark.Length;
 	return *this;
@@ -48,8 +48,8 @@
 inline ZLTextMark::~ZLTextMark() {}
 
 inline bool ZLTextMark::operator < (const ZLTextMark &mark) const {
-	return (ParagraphNumber < mark.ParagraphNumber) ||
-				 ((ParagraphNumber == mark.ParagraphNumber) && (Offset < mark.Offset));
+	return (ParagraphIndex < mark.ParagraphIndex) ||
+				 ((ParagraphIndex == mark.ParagraphIndex) && (Offset < mark.Offset));
 }
 inline bool ZLTextMark::operator > (const ZLTextMark &mark) const {
 	return mark < *this;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextModel.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextModel.cpp
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextModel.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextModel.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@
 
 void ZLTextModel::selectParagraph(size_t index) const {
 	if (index < paragraphsNumber()) {
-		myMarks.push_back(ZLTextMark(index, 0, (*this)[index]->textLength()));
+		myMarks.push_back(ZLTextMark(index, 0, (*this)[index]->textDataLength()));
 	}
 }
 
@@ -134,7 +134,7 @@
 void ZLTextTreeModel::search(const std::string &text, size_t startIndex, size_t endIndex, bool ignoreCase) const {
 	ZLTextModel::search(text, startIndex, endIndex, ignoreCase);
 	for (std::vector<ZLTextMark>::const_iterator it = marks().begin(); it != marks().end(); ++it) {
-		((ZLTextTreeParagraph*)(*this)[it->ParagraphNumber])->openTree();
+		((ZLTextTreeParagraph*)(*this)[it->ParagraphIndex])->openTree();
 	}
 }
 
@@ -217,22 +217,47 @@
 	myParagraphs.back()->addEntry(myLastEntryStart);
 }
 
-void ZLTextModel::addControl(const ZLTextForcedControlEntry &entry) {
-	myLastEntryStart = myAllocator.allocate(3 + 2 * sizeof(short));
-	*myLastEntryStart = ZLTextParagraphEntry::FORCED_CONTROL_ENTRY;
-	*(myLastEntryStart + 1) = entry.myMask;
-	memcpy(myLastEntryStart + 2, &entry.myLeftIndent, sizeof(short));
-	memcpy(myLastEntryStart + 2 + sizeof(short), &entry.myRightIndent, sizeof(short));
-	*(myLastEntryStart + 2 + 2 * sizeof(short)) = entry.myAlignmentType;
+void ZLTextModel::addControl(const ZLTextStyleEntry &entry) {
+	int len = sizeof(int) + 4 + ZLTextStyleEntry::NUMBER_OF_LENGTHS * (sizeof(short) + 1);
+	if (entry.fontFamilySupported()) {
+		len += entry.fontFamily().length() + 1;
+	}
+	myLastEntryStart = myAllocator.allocate(len);
+	char *address = myLastEntryStart;
+	*address++ = ZLTextParagraphEntry::STYLE_ENTRY;
+	memcpy(address, &entry.myMask, sizeof(int));
+	address += sizeof(int);
+	for (int i = 0; i < ZLTextStyleEntry::NUMBER_OF_LENGTHS; ++i) {
+		*address++ = entry.myLengths[i].Unit;
+		memcpy(address, &entry.myLengths[i].Size, sizeof(short));
+		address += sizeof(short);
+	}
+	char &mask = *address++;
+	mask = 0;
+	if (entry.myBold) {
+		mask |= 1;
+	}
+	if (entry.myItalic) {
+		mask |= 2;
+	}
+	*address++ = entry.myAlignmentType;
+	*address++ = entry.myFontSizeMag;
+	if (entry.fontFamilySupported()) {
+		memcpy(address, entry.fontFamily().data(), entry.fontFamily().length());
+		address += entry.fontFamily().length();
+		*address++ = '\0';
+	}
 	myParagraphs.back()->addEntry(myLastEntryStart);
 }
 
-void ZLTextModel::addHyperlinkControl(ZLTextKind textKind, const std::string &label) {
-	myLastEntryStart = myAllocator.allocate(label.length() + 3);
+void ZLTextModel::addHyperlinkControl(ZLTextKind textKind, const std::string &label, const std::string &hyperlinkType) {
+	myLastEntryStart = myAllocator.allocate(label.length() + hyperlinkType.length() + 4);
 	*myLastEntryStart = ZLTextParagraphEntry::HYPERLINK_CONTROL_ENTRY;
 	*(myLastEntryStart + 1) = textKind;
 	memcpy(myLastEntryStart + 2, label.data(), label.length());
 	*(myLastEntryStart + label.length() + 2) = '\0';
+	memcpy(myLastEntryStart + label.length() + 3, hyperlinkType.data(), hyperlinkType.length());
+	*(myLastEntryStart + label.length() + hyperlinkType.length() + 3) = '\0';
 	myParagraphs.back()->addEntry(myLastEntryStart);
 }
 
@@ -246,3 +271,9 @@
 	*(myLastEntryStart + 1 + sizeof(const ZLImageMap*) + sizeof(short) + id.length()) = '\0';
 	myParagraphs.back()->addEntry(myLastEntryStart);
 }
+
+void ZLTextModel::addBidiReset() {
+	myLastEntryStart = myAllocator.allocate(1);
+	*myLastEntryStart = ZLTextParagraphEntry::RESET_BIDI_ENTRY;
+	myParagraphs.back()->addEntry(myLastEntryStart);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextModel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextModel.h
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextModel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextModel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,12 +62,13 @@
 	ZLTextMark previousMark(ZLTextMark position) const;
 
 	void addControl(ZLTextKind textKind, bool isStart);
-	void addControl(const ZLTextForcedControlEntry &entry);
-	void addHyperlinkControl(ZLTextKind textKind, const std::string &label);
+	void addControl(const ZLTextStyleEntry &entry);
+	void addHyperlinkControl(ZLTextKind textKind, const std::string &label, const std::string &hyperlinkType);
 	void addText(const std::string &text);
 	void addText(const std::vector<std::string> &text);
 	void addImage(const std::string &id, const ZLImageMap &imageMap, short vOffset);
 	void addFixedHSpace(unsigned char length);
+	void addBidiReset();
 
 protected:
 	void addParagraphInternal(ZLTextParagraph *paragraph);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextParagraph.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextParagraph.cpp
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextParagraph.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextParagraph.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,21 +21,58 @@
 
 #include <algorithm>
 
+#include <ZLUnicodeUtil.h>
 #include <ZLImage.h>
 
 #include "ZLTextParagraph.h"
 
+const shared_ptr<ZLTextParagraphEntry> ResetBidiEntry::Instance = new ResetBidiEntry();
+
 size_t ZLTextEntry::dataLength() const {
 	size_t len;
 	memcpy(&len, myAddress, sizeof(size_t));
 	return len;
 }
 
-ZLTextForcedControlEntry::ZLTextForcedControlEntry(char *address) {
-	myMask = *address;
-	memcpy(&myLeftIndent, address + 1, sizeof(short));
-	memcpy(&myRightIndent, address + 1 + sizeof(short), sizeof(short));
-	myAlignmentType = (ZLTextAlignmentType)*(address + 1 + 2 * sizeof(short));
+short ZLTextStyleEntry::length(Length name, const Metrics &metrics) const {
+	switch (myLengths[name].Unit) {
+		default:
+		case SIZE_UNIT_PIXEL:
+			return myLengths[name].Size;
+		case SIZE_UNIT_EM_100:
+			return (myLengths[name].Size * metrics.FontSize + 50) / 100;
+		case SIZE_UNIT_EX_100:
+			return (myLengths[name].Size * metrics.FontXHeight + 50) / 100;
+		case SIZE_UNIT_PERCENT:
+			switch (name) {
+				default:
+				case LENGTH_LEFT_INDENT:
+				case LENGTH_RIGHT_INDENT:
+				case LENGTH_FIRST_LINE_INDENT_DELTA:
+					return (myLengths[name].Size * metrics.FullWidth + 50) / 100;
+				case LENGTH_SPACE_BEFORE:
+				case LENGTH_SPACE_AFTER:
+					return (myLengths[name].Size * metrics.FullHeight + 50) / 100;
+			}
+	}
+}
+
+ZLTextStyleEntry::ZLTextStyleEntry(char *address) {
+	memcpy(&myMask, address, sizeof(int));
+	address += sizeof(int);
+	for (int i = 0; i < NUMBER_OF_LENGTHS; ++i) {
+		myLengths[i].Unit = (SizeUnit)*address++;
+		memcpy(&myLengths[i].Size, address, sizeof(short));
+		address += sizeof(short);
+	}
+	const char mask = *address++;
+	myBold = mask & 1;
+	myItalic = mask & 2;
+	myAlignmentType = (ZLTextAlignmentType)*address++;
+	myFontSizeMag = (signed char)*address++;
+	if (fontFamilySupported()) {
+		myFontFamily = address;
+	}
 }
 
 const shared_ptr<ZLTextParagraphEntry> ZLTextParagraph::Iterator::entry() const {
@@ -62,12 +99,15 @@
 				myEntry = new ImageEntry(myPointer + sizeof(const ZLImageMap*) + sizeof(short) + 1, imageMap, vOffset);
 				break;
 			}
-			case ZLTextParagraphEntry::FORCED_CONTROL_ENTRY:
-				myEntry = new ZLTextForcedControlEntry(myPointer + 1);
+			case ZLTextParagraphEntry::STYLE_ENTRY:
+				myEntry = new ZLTextStyleEntry(myPointer + 1);
 				break;
 			case ZLTextParagraphEntry::FIXED_HSPACE_ENTRY:
 				myEntry = new ZLTextFixedHSpaceEntry((unsigned char)*(myPointer + 1));
 				break;
+			case ZLTextParagraphEntry::RESET_BIDI_ENTRY:
+				myEntry = ResetBidiEntry::Instance;
+				break;
 		}
 	}
 	return myEntry;
@@ -94,6 +134,10 @@
 					++myPointer;
 				}
 				++myPointer;
+				while (*myPointer != '\0') {
+					++myPointer;
+				}
+				++myPointer;
 				break;
 			case ZLTextParagraphEntry::IMAGE_ENTRY:
 				myPointer += sizeof(const ZLImageMap*) + sizeof(short) + 1;
@@ -102,12 +146,26 @@
 				}
 				++myPointer;
 				break;
-			case ZLTextParagraphEntry::FORCED_CONTROL_ENTRY:
-				myPointer += 2 * sizeof(short) + 3;
+			case ZLTextParagraphEntry::STYLE_ENTRY:
+			{
+				int mask;
+				memcpy(&mask, myPointer + 1, sizeof(int));
+				bool withFontFamily = mask & ZLTextStyleEntry::SUPPORT_FONT_FAMILY;
+				myPointer += sizeof(int) + ZLTextStyleEntry::NUMBER_OF_LENGTHS * (sizeof(short) + 1) + 4;
+				if (withFontFamily) {
+					while (*myPointer != '\0') {
+						++myPointer;
+					}
+					++myPointer;
+				}
 				break;
+			}
 			case ZLTextParagraphEntry::FIXED_HSPACE_ENTRY:
 				myPointer += 2;
 				break;
+			case ZLTextParagraphEntry::RESET_BIDI_ENTRY:
+				++myPointer;
+				break;
 		}
 		if (*myPointer == 0) {
 			memcpy(&myPointer, myPointer + 1, sizeof(char*));
@@ -128,7 +186,7 @@
 	return entry;
 }
 	
-size_t ZLTextParagraph::textLength() const {
+size_t ZLTextParagraph::textDataLength() const {
 	size_t len = 0;
 	for (Iterator it = *this; !it.isEnd(); it.next()) {
 		if (it.entryKind() == ZLTextParagraphEntry::TEXT_ENTRY) {
@@ -138,6 +196,26 @@
 	return len;
 }
 
+size_t ZLTextParagraph::characterNumber() const {
+	size_t len = 0;
+	for (Iterator it = *this; !it.isEnd(); it.next()) {
+		switch (it.entryKind()) {
+			case ZLTextParagraphEntry::TEXT_ENTRY:
+			{
+				const ZLTextEntry &entry = (ZLTextEntry&)*it.entry();
+				len += ZLUnicodeUtil::utf8Length(entry.data(), entry.dataLength());
+				break;
+			}
+			case ZLTextParagraphEntry::IMAGE_ENTRY:
+				len += 100;
+				break;
+			default:
+				break;
+		}
+	}
+	return len;
+}
+
 shared_ptr<const ZLImage> ImageEntry::image() const {
 	ZLImageMap::const_iterator it = myMap->find(myId);
 	return (it != myMap->end()) ? (*it).second : 0;
@@ -171,3 +249,6 @@
 	}
 	return size;
 }
+
+ResetBidiEntry::ResetBidiEntry() {
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextParagraph.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextParagraph.h
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextParagraph.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextParagraph.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,8 +40,9 @@
 		IMAGE_ENTRY = 2,
 		CONTROL_ENTRY = 3,
 		HYPERLINK_CONTROL_ENTRY = 4,
-		FORCED_CONTROL_ENTRY = 5,
+		STYLE_ENTRY = 5,
 		FIXED_HSPACE_ENTRY = 6,
+		RESET_BIDI_ENTRY = 7,
 	};
 
 protected:
@@ -55,37 +56,87 @@
 	const ZLTextParagraphEntry &operator = (const ZLTextParagraphEntry &entry);
 };
 
-class ZLTextForcedControlEntry : public ZLTextParagraphEntry {
+class ZLTextStyleEntry : public ZLTextParagraphEntry {
 
 public:
-	ZLTextForcedControlEntry();
-	ZLTextForcedControlEntry(char *address);
-	~ZLTextForcedControlEntry();
+	enum SizeUnit {
+		SIZE_UNIT_PIXEL,
+		SIZE_UNIT_EM_100,
+		SIZE_UNIT_EX_100,
+		SIZE_UNIT_PERCENT
+	};
+
+	struct Metrics {
+		Metrics(int fontSize, int fontXHeight, int fullWidth, int fullHeight);
+
+		int FontSize;
+		int FontXHeight;
+		int FullWidth;
+		int FullHeight;
+	};
+
+	enum Length {
+		LENGTH_LEFT_INDENT = 0,
+		LENGTH_RIGHT_INDENT = 1,
+		LENGTH_FIRST_LINE_INDENT_DELTA = 2,
+		LENGTH_SPACE_BEFORE = 3,
+		LENGTH_SPACE_AFTER = 4,
+		NUMBER_OF_LENGTHS = 5,
+	};
 
-	bool leftIndentSupported() const;
-	short leftIndent() const;
-	void setLeftIndent(short leftIndent);
+private:
+	struct LengthType {
+		SizeUnit Unit;
+		short Size;
+	};
 
-	bool rightIndentSupported() const;
-	short rightIndent() const;
-	void setRightIndent(short rightIndent);
+public:
+	ZLTextStyleEntry();
+	ZLTextStyleEntry(char *address);
+	~ZLTextStyleEntry();
+
+	bool isEmpty() const;
+
+	bool lengthSupported(Length name) const;
+	short length(Length name, const Metrics &metrics) const;
+	void setLength(Length name, short length, SizeUnit unit);
 
 	bool alignmentTypeSupported() const;
 	ZLTextAlignmentType alignmentType() const;
 	void setAlignmentType(ZLTextAlignmentType alignmentType);
 
-	enum {
-		SUPPORT_LEFT_INDENT = 1 << 0,
-		SUPPORT_RIGHT_INDENT = 1 << 1,
-		SUPPORT_ALIGNMENT_TYPE = 1 << 2,
-	};
+	bool boldSupported() const;
+	bool bold() const;
+	void setBold(bool bold);
+
+	bool italicSupported() const;
+	bool italic() const;
+	void setItalic(bool italic);
+
+	bool fontSizeSupported() const;
+	signed char fontSizeMag() const;
+	void setFontSizeMag(signed char fontSizeMag);
+
+	bool fontFamilySupported() const;
+	const std::string &fontFamily() const;
+	void setFontFamily(const std::string &fontFamily);
+
+	static const int SUPPORT_BOLD = 1 << NUMBER_OF_LENGTHS;
+	static const int SUPPORT_ITALIC = 1 << (NUMBER_OF_LENGTHS + 1);
+	static const int SUPPORT_ALIGNMENT_TYPE = 1 << (NUMBER_OF_LENGTHS + 2);
+	static const int SUPPORT_FONT_SIZE = 1 << (NUMBER_OF_LENGTHS + 3);
+	static const int SUPPORT_FONT_FAMILY = 1 << (NUMBER_OF_LENGTHS + 4);
 
 private:
 	int myMask;
 
-	short myLeftIndent;
-	short myRightIndent;
+	LengthType myLengths[NUMBER_OF_LENGTHS];
+
 	ZLTextAlignmentType myAlignmentType;
+	bool myBold;
+	bool myItalic;
+	signed char myFontSizeMag;
+	std::string myFontFamily;
 
 friend class ZLTextModel;
 };
@@ -139,10 +190,12 @@
 	ZLTextHyperlinkControlEntry(const char *address);
 	~ZLTextHyperlinkControlEntry();
 	const std::string &label() const;
+	const std::string &hyperlinkType() const;
 	bool isHyperlink() const;
 
 private:
-	std::string myLabel;
+	const std::string myLabel;
+	const std::string myHyperlinkType;
 };
 
 class ZLTextEntry : public ZLTextParagraphEntry {
@@ -173,6 +226,15 @@
 	const short myVOffset;
 };
 
+class ResetBidiEntry : public ZLTextParagraphEntry {
+
+public:
+	static const shared_ptr<ZLTextParagraphEntry> Instance;
+
+private:
+	ResetBidiEntry();
+};
+
 class ZLTextParagraph {
 
 public:
@@ -213,7 +275,8 @@
 
 	size_t entryNumber() const;
 
-	size_t textLength() const;
+	size_t textDataLength() const;
+	size_t characterNumber() const;
 
 private:
 	void addEntry(char *address);
@@ -273,17 +336,39 @@
 inline ZLTextParagraphEntry::ZLTextParagraphEntry() {}
 inline ZLTextParagraphEntry::~ZLTextParagraphEntry() {}
 
-inline ZLTextForcedControlEntry::ZLTextForcedControlEntry() : myMask(0) {}
-inline ZLTextForcedControlEntry::~ZLTextForcedControlEntry() {}
-inline bool ZLTextForcedControlEntry::leftIndentSupported() const { return myMask & SUPPORT_LEFT_INDENT; }
-inline short ZLTextForcedControlEntry::leftIndent() const { return myLeftIndent; }
-inline void ZLTextForcedControlEntry::setLeftIndent(short leftIndent) { myLeftIndent = leftIndent; myMask |= SUPPORT_LEFT_INDENT; }
-inline bool ZLTextForcedControlEntry::rightIndentSupported() const { return myMask & SUPPORT_RIGHT_INDENT; }
-inline short ZLTextForcedControlEntry::rightIndent() const { return myRightIndent; }
-inline void ZLTextForcedControlEntry::setRightIndent(short rightIndent) { myRightIndent = rightIndent; myMask |= SUPPORT_RIGHT_INDENT; }
-inline bool ZLTextForcedControlEntry::alignmentTypeSupported() const { return myMask & SUPPORT_ALIGNMENT_TYPE; }
-inline ZLTextAlignmentType ZLTextForcedControlEntry::alignmentType() const { return myAlignmentType; }
-inline void ZLTextForcedControlEntry::setAlignmentType(ZLTextAlignmentType alignmentType) { myAlignmentType = alignmentType; myMask |= SUPPORT_ALIGNMENT_TYPE; }
+inline ZLTextStyleEntry::ZLTextStyleEntry() : myMask(0) {}
+inline ZLTextStyleEntry::~ZLTextStyleEntry() {}
+
+inline ZLTextStyleEntry::Metrics::Metrics(int fontSize, int fontXHeight, int fullWidth, int fullHeight) : FontSize(fontSize), FontXHeight(fontXHeight), FullWidth(fullWidth), FullHeight(fullHeight) {}
+
+inline bool ZLTextStyleEntry::isEmpty() const { return myMask == 0; }
+
+inline bool ZLTextStyleEntry::lengthSupported(Length name) const { return myMask & (1 << name); }
+inline void ZLTextStyleEntry::setLength(Length name, short length, SizeUnit unit) {
+	myLengths[name].Size = length;
+	myLengths[name].Unit = unit;
+	myMask |= 1 << name;
+}
+
+inline bool ZLTextStyleEntry::alignmentTypeSupported() const { return myMask & SUPPORT_ALIGNMENT_TYPE; }
+inline ZLTextAlignmentType ZLTextStyleEntry::alignmentType() const { return myAlignmentType; }
+inline void ZLTextStyleEntry::setAlignmentType(ZLTextAlignmentType alignmentType) { myAlignmentType = alignmentType; myMask |= SUPPORT_ALIGNMENT_TYPE; }
+
+inline bool ZLTextStyleEntry::boldSupported() const { return myMask & SUPPORT_BOLD; }
+inline bool ZLTextStyleEntry::bold() const { return myBold; }
+inline void ZLTextStyleEntry::setBold(bool bold) { myBold = bold; myMask |= SUPPORT_BOLD; }
+
+inline bool ZLTextStyleEntry::italicSupported() const { return myMask & SUPPORT_ITALIC; }
+inline bool ZLTextStyleEntry::italic() const { return myItalic; }
+inline void ZLTextStyleEntry::setItalic(bool italic) { myItalic = italic; myMask |= SUPPORT_ITALIC; }
+
+inline bool ZLTextStyleEntry::fontSizeSupported() const { return myMask & SUPPORT_FONT_SIZE; }
+inline signed char ZLTextStyleEntry::fontSizeMag() const { return myFontSizeMag; }
+inline void ZLTextStyleEntry::setFontSizeMag(signed char fontSizeMag) { myFontSizeMag = fontSizeMag; myMask |= SUPPORT_FONT_SIZE; }
+
+inline bool ZLTextStyleEntry::fontFamilySupported() const { return myMask & SUPPORT_FONT_FAMILY; }
+inline const std::string &ZLTextStyleEntry::fontFamily() const { return myFontFamily; }
+inline void ZLTextStyleEntry::setFontFamily(const std::string &fontFamily) { myFontFamily = fontFamily; myMask |= SUPPORT_FONT_FAMILY; }
 
 inline ZLTextControlEntry::ZLTextControlEntry(ZLTextKind kind, bool isStart) : myKind(kind), myStart(isStart) {}
 inline ZLTextControlEntry::~ZLTextControlEntry() {}
@@ -297,9 +382,10 @@
 inline ZLTextControlEntryPool::ZLTextControlEntryPool() {}
 inline ZLTextControlEntryPool::~ZLTextControlEntryPool() {}
 
-inline ZLTextHyperlinkControlEntry::ZLTextHyperlinkControlEntry(const char *address) : ZLTextControlEntry((ZLTextKind)*address, true), myLabel(address + 1) {}
+inline ZLTextHyperlinkControlEntry::ZLTextHyperlinkControlEntry(const char *address) : ZLTextControlEntry((ZLTextKind)*address, true), myLabel(address + 1), myHyperlinkType(address + myLabel.length() + 2) {}
 inline ZLTextHyperlinkControlEntry::~ZLTextHyperlinkControlEntry() {}
 inline const std::string &ZLTextHyperlinkControlEntry::label() const { return myLabel; }
+inline const std::string &ZLTextHyperlinkControlEntry::hyperlinkType() const { return myHyperlinkType; }
 inline bool ZLTextHyperlinkControlEntry::isHyperlink() const { return true; }
 
 inline ZLTextEntry::ZLTextEntry(const char *address) : myAddress(address) {}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextRowMemoryAllocator.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextRowMemoryAllocator.cpp
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextRowMemoryAllocator.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextRowMemoryAllocator.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/model/ZLTextRowMemoryAllocator.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextRowMemoryAllocator.h
--- fbreader-0.8.17/zlibrary/text/src/model/ZLTextRowMemoryAllocator.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/model/ZLTextRowMemoryAllocator.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/Processor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/Processor.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/Processor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/Processor.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <algorithm>
-
-#include <ZLUnicodeUtil.h>
-#include <ZLImage.h>
-
-#include <ZLTextParagraph.h>
-
-#include "ZLTextParagraphCursor.h"
-#include "ZLTextWord.h"
-
-void ZLTextParagraphCursor::Processor::addWord(const char *ptr, int offset, int len) {
-	ZLTextWord *word = ZLTextElementPool::Pool.getWord(ptr, len, offset);
-	for (std::vector<ZLTextMark>::const_iterator mit = myFirstMark; mit != myLastMark; ++mit) {
-		ZLTextMark mark = *mit;
-		if ((mark.Offset < offset + len) && (mark.Offset + mark.Length > offset)) {
-			word->addMark(mark.Offset - offset, mark.Length);
-		}
-	}
-	myElements.push_back(word);
-}
-
-void ZLTextParagraphCursor::Processor::fill() {
-	for (ZLTextParagraph::Iterator it = myParagraph; !it.isEnd(); it.next()) {
-		switch (it.entryKind()) {
-			case ZLTextParagraphEntry::FORCED_CONTROL_ENTRY:
-				myElements.push_back(new ZLTextForcedControlElement(it.entry()));
-				break;
-			case ZLTextParagraphEntry::FIXED_HSPACE_ENTRY:
-				myElements.push_back(new ZLTextFixedHSpaceElement(((ZLTextFixedHSpaceEntry&)*it.entry()).length()));
-				break;
-			case ZLTextParagraphEntry::CONTROL_ENTRY:
-			case ZLTextParagraphEntry::HYPERLINK_CONTROL_ENTRY:
-				myElements.push_back(ZLTextElementPool::Pool.getControlElement(it.entry()));
-				break;
-			case ZLTextParagraphEntry::IMAGE_ENTRY:
-			{
-				ImageEntry &imageEntry = (ImageEntry&)*it.entry();
-				shared_ptr<const ZLImage> image = imageEntry.image();
-				if (!image.isNull()) {
-					shared_ptr<ZLImageData> data = ZLImageManager::instance().imageData(*image);
-					if (!data.isNull()) {
-						myElements.push_back(new ZLTextImageElement(imageEntry.id(), data));
-					}
-				}
-				break;
-			}
-			case ZLTextParagraphEntry::TEXT_ENTRY:
-				processTextEntry((const ZLTextEntry&)*it.entry());
-				break;
-		}
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/YongweiProcessor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/YongweiProcessor.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/YongweiProcessor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/YongweiProcessor.cpp	1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <algorithm>
-
-#include <linebreak.h>
-
-#include <ZLUnicodeUtil.h>
-
-#include <ZLTextParagraph.h>
-
-#include "ZLTextParagraphCursor.h"
-#include "ZLTextWord.h"
-
-bool ZLTextParagraphCursor::Processor::ourIndexIsInitialised = false;
-
-ZLTextParagraphCursor::Processor::Processor(const std::string &language, const ZLTextParagraph &paragraph, const std::vector<ZLTextMark> &marks, int paragraphNumber, ZLTextElementVector &elements) : myParagraph(paragraph), myElements(elements), myLanguage(language), myBreaksTable(0) {
-	myFirstMark = std::lower_bound(marks.begin(), marks.end(), ZLTextMark(paragraphNumber, 0, 0));
-	myLastMark = myFirstMark;
-	for (; (myLastMark != marks.end()) && (myLastMark->ParagraphNumber == paragraphNumber); ++myLastMark);
-	myOffset = 0;
-	if (!ourIndexIsInitialised) {
-		init_linebreak();
-		ourIndexIsInitialised = true;
-	}
-}
-
-ZLTextParagraphCursor::Processor::~Processor() {
-	if (myBreaksTable != 0) {
-		delete[] myBreaksTable;
-	}
-}
-
-void ZLTextParagraphCursor::Processor::processTextEntry(const ZLTextEntry &textEntry) {
-	const size_t dataLength = textEntry.dataLength();
-	if (dataLength != 0) {
-		if ((myBreaksTable != 0) && (myBreaksTableLength < dataLength)) {
-			delete[] myBreaksTable;
-			myBreaksTable = 0;
-		}
-		if (myBreaksTable == 0) {
-			myBreaksTableLength = dataLength;
-			myBreaksTable = new char[dataLength];
-		}
-		const char *start = textEntry.data();
-		const char *end = start + dataLength;
-		set_linebreaks_utf8((const utf8_t*)start, dataLength, myLanguage.c_str(), myBreaksTable);
-		ZLUnicodeUtil::Ucs2Char ch;
-		enum { NO_SPACE, SPACE, NON_BREAKABLE_SPACE } spaceState = NO_SPACE;
-		int charLength = 0;
-		int index = 0;
-		const char *wordStart = start;
-		for (const char *ptr = start; ptr < end; ptr += charLength, index += charLength) {
-			charLength = ZLUnicodeUtil::firstChar(ch, ptr);
-			if (ZLUnicodeUtil::isSpace(ch)) {
-				if ((spaceState == NO_SPACE) && (ptr != wordStart)) {
-					addWord(wordStart, myOffset + (wordStart - textEntry.data()), ptr - wordStart);
-				}
-				spaceState = SPACE;
-			} else if (ZLUnicodeUtil::isNBSpace(ch)) {
-				if (spaceState == NO_SPACE) {
-					if (ptr != wordStart) {
-						addWord(wordStart, myOffset + (wordStart - textEntry.data()), ptr - wordStart);
-					}
-					spaceState = NON_BREAKABLE_SPACE;
-				}
-			} else {
-				switch (spaceState) {
-					case SPACE:
-						if (myBreaksTable[index - 1] == LINEBREAK_NOBREAK) {
-							myElements.push_back(ZLTextElementPool::Pool.NBHSpaceElement);
-						} else {
-							myElements.push_back(ZLTextElementPool::Pool.HSpaceElement);
-						}
-						wordStart = ptr;
-						break;
-					case NON_BREAKABLE_SPACE:
-						myElements.push_back(ZLTextElementPool::Pool.NBHSpaceElement);
-						wordStart = ptr;
-						break;
-					case NO_SPACE:
-						if ((index > 0) && (myBreaksTable[index - 1] != LINEBREAK_NOBREAK) && (ptr != wordStart)) {
-							addWord(wordStart, myOffset + (wordStart - textEntry.data()), ptr - wordStart);
-							wordStart = ptr;
-						}
-						break;
-				}
-				spaceState = NO_SPACE;
-			}
-		}
-		switch (spaceState) {
-			case SPACE:
-				myElements.push_back(ZLTextElementPool::Pool.HSpaceElement);
-				break;
-			case NON_BREAKABLE_SPACE:
-				myElements.push_back(ZLTextElementPool::Pool.NBHSpaceElement);
-				break;
-			case NO_SPACE:
-				addWord(wordStart, myOffset + (wordStart - textEntry.data()), end - wordStart);
-				break;
-		}
-		myOffset += dataLength;
-	}
-}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextArea.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextArea.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextArea.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextArea.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,20 +42,20 @@
 };
 
 struct ZLTextElementArea : public ZLTextRectangularArea {
-	int ParagraphNumber;
-	int TextElementNumber;
-	int StartCharNumber;
+	int ParagraphIndex;
+	int ElementIndex;
+	int StartCharIndex;
 	int Length;
 	bool AddHyphenationSign;
-	bool ChangeStyle;
 	ZLTextStylePtr Style;
 	ZLTextElement::Kind Kind;
-	ZLTextElementArea(int paragraphNumber, int textElementNumber, int startCharNumber, int length, bool addHyphenationSign, bool changeStyle, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd);
+	unsigned char BidiLevel;
+	ZLTextElementArea(int paragraphIndex, int elementIndex, int startCharIndex, int length, bool addHyphenationSign, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd, unsigned char bidiLevel);
 };
 
 struct ZLTextTreeNodeArea : public ZLTextRectangularArea {
-	int ParagraphNumber;
-	ZLTextTreeNodeArea(int paragraphNumber, int xStart, int xEnd, int yStart, int yEnd);
+	int ParagraphIndex;
+	ZLTextTreeNodeArea(int paragraphIndex, int xStart, int xEnd, int yStart, int yEnd);
 };
 
 typedef std::vector<ZLTextTreeNodeArea> ZLTextTreeNodeMap;
@@ -64,8 +64,8 @@
 
 inline ZLTextRectangularArea::ZLTextRectangularArea(int xStart, int xEnd, int yStart, int yEnd) : XStart(xStart), XEnd(xEnd), YStart(yStart), YEnd(yEnd) {}
 
-inline ZLTextElementArea::ZLTextElementArea(int paragraphNumber, int textElementNumber, int startCharNumber, int length, bool addHyphenationSign, bool changeStyle, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphNumber(paragraphNumber), TextElementNumber(textElementNumber), StartCharNumber(startCharNumber), Length(length), AddHyphenationSign(addHyphenationSign), ChangeStyle(changeStyle), Style(style), Kind(kind) {}
+inline ZLTextElementArea::ZLTextElementArea(int paragraphIndex, int elementIndex, int startCharIndex, int length, bool addHyphenationSign, ZLTextStylePtr style, ZLTextElement::Kind kind, int xStart, int xEnd, int yStart, int yEnd, unsigned char bidiLevel) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphIndex(paragraphIndex), ElementIndex(elementIndex), StartCharIndex(startCharIndex), Length(length), AddHyphenationSign(addHyphenationSign), Style(style), Kind(kind), BidiLevel(bidiLevel) {}
 
-inline ZLTextTreeNodeArea::ZLTextTreeNodeArea(int paragraphNumber, int xStart, int xEnd, int yStart, int yEnd) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphNumber(paragraphNumber) {}
+inline ZLTextTreeNodeArea::ZLTextTreeNodeArea(int paragraphIndex, int xStart, int xEnd, int yStart, int yEnd) : ZLTextRectangularArea(xStart, xEnd, yStart, yEnd), ParagraphIndex(paragraphIndex) {}
 
 #endif /* __ZLTEXTAREA_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextBaseStyle.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextBaseStyle.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextBaseStyle.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextBaseStyle.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,8 +29,6 @@
 	SelectionBackgroundColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "SelectionBackground", ZLColor(82, 131, 194)),
 	SelectedTextColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "SelectedText", ZLColor(60, 139, 255)),
 	RegularTextColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "Text", ZLColor(0, 0, 0)),
-	InternalHyperlinkTextColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "Hyperlink", ZLColor(33, 96, 180)),
-	ExternalHyperlinkTextColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "ExternalHyperlink", ZLColor(98, 174, 26)),
 	TreeLinesColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "TreeLines", ZLColor(127, 127, 127)),
 	AutoHyphenationOption(ZLCategoryKey::LOOK_AND_FEEL, "Options", "AutoHyphenation", true),
 	FontFamilyOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:fontFamily", fontFamily),
@@ -38,10 +36,21 @@
 	BoldOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:bold", false),
 	ItalicOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:italic", false),
 	AlignmentOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:alignment", ALIGN_JUSTIFY),
-	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacing", 1.2),
-	LineSpacePercentOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacingPercent", 120) {
+	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacing", 1.4),
+	LineSpacePercentOption(ZLCategoryKey::LOOK_AND_FEEL, GROUP, "Base:lineSpacingPercent", 140) {
+	myHyperlinkColorOptions["internal"] = new ZLColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "Hyperlink", ZLColor(33, 96, 180));
+	myHyperlinkColorOptions["external"] = new ZLColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "ExternalHyperlink", ZLColor(98, 174, 26));
+	myHyperlinkColorOptions["book"] = new ZLColorOption(ZLCategoryKey::LOOK_AND_FEEL, COLORS, "BookHyperlink", ZLColor(143, 89, 2));
 }
 
 ZLColor ZLTextBaseStyle::color() const {
 	return RegularTextColorOption.value();
 }
+
+bool ZLTextBaseStyle::hasHyperlinkColorOption(const std::string &type) {
+	return myHyperlinkColorOptions.find(type) != myHyperlinkColorOptions.end();
+}
+
+ZLColorOption &ZLTextBaseStyle::hyperlinkColorOption(const std::string &type) {
+	return *myHyperlinkColorOptions[type];
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextDecoratedStyle.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,15 +32,14 @@
 	ItalicOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":italic", italic),
 	VerticalShiftOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":vShift", verticalShift),
 	AllowHyphenationsOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":allowHyphenations", allowHyphenations),
-	myName(name),
-	myHyperlinkStyle(NONE) {
+	myName(name) {
 }
 
-ZLTextFullStyleDecoration::ZLTextFullStyleDecoration(const std::string &name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, int spaceBefore, int spaceAfter, int leftIndent, int rightIndent, int firstLineIndentDelta, int verticalShift, ZLTextAlignmentType alignment, double lineSpace, ZLBoolean3 allowHyphenations) : ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, verticalShift, allowHyphenations),
+ZLTextFullStyleDecoration::ZLTextFullStyleDecoration(const std::string &name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, short spaceBefore, short spaceAfter, short lineStartIndent, short lineEndIndent, short firstLineIndentDelta, int verticalShift, ZLTextAlignmentType alignment, double lineSpace, ZLBoolean3 allowHyphenations) : ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, verticalShift, allowHyphenations),
 	SpaceBeforeOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":spaceBefore", -10, 100, spaceBefore),
 	SpaceAfterOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":spaceAfter", -10, 100, spaceAfter),
-	LeftIndentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":leftIndent", -300, 300, leftIndent),
-	RightIndentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":rightIndent", -300, 300, rightIndent),
+	LineStartIndentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":leftIndent", -300, 300, lineStartIndent),
+	LineEndIndentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":rightIndent", -300, 300, lineEndIndent),
 	FirstLineIndentDeltaOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":firstLineIndentDelta", -300, 300, firstLineIndentDelta),
 	AlignmentOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":alignment", alignment),
 	LineSpaceOption(ZLCategoryKey::LOOK_AND_FEEL, STYLE, name + ":lineSpace", lineSpace),
@@ -80,8 +79,8 @@
 	return true;
 }
 
-int ZLTextFullDecoratedStyle::firstLineIndentDelta() const {
-	return (alignment() == ALIGN_CENTER) ? 0 : base()->firstLineIndentDelta() + myDecoration.FirstLineIndentDeltaOption.value();
+short ZLTextFullDecoratedStyle::firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const {
+	return (alignment() == ALIGN_CENTER) ? 0 : base()->firstLineIndentDelta(metrics) + myDecoration.FirstLineIndentDeltaOption.value();
 }
 
 const std::string &ZLTextFullDecoratedStyle::fontFamily() const {
@@ -115,39 +114,115 @@
 }
 
 ZLColor ZLTextPartialDecoratedStyle::color() const {
-	ZLTextStyleDecoration::HyperlinkStyle hyperlinkStyle = myDecoration.hyperlinkStyle();
-	if (hyperlinkStyle == ZLTextStyleDecoration::NONE) {
-		return base()->color();
-	}
-	ZLTextBaseStyle &baseStyle = ZLTextStyleCollection::instance().baseStyle();
-	if (hyperlinkStyle == ZLTextStyleDecoration::INTERNAL) {
-		return baseStyle.InternalHyperlinkTextColorOption.value();
-	} else {
-		return baseStyle.ExternalHyperlinkTextColorOption.value();
+	const std::string &hyperlinkStyle = myDecoration.hyperlinkStyle();
+	if (!hyperlinkStyle.empty()) {
+		ZLTextBaseStyle &baseStyle = ZLTextStyleCollection::instance().baseStyle();
+		if (baseStyle.hasHyperlinkColorOption(hyperlinkStyle)) {
+			return baseStyle.hyperlinkColorOption(hyperlinkStyle).value();
+		}
 	}
+	return base()->color();
 }
 
 ZLColor ZLTextFullDecoratedStyle::color() const {
-	ZLTextStyleDecoration::HyperlinkStyle hyperlinkStyle = myDecoration.hyperlinkStyle();
-	if (hyperlinkStyle == ZLTextStyleDecoration::NONE) {
-		return base()->color();
+	const std::string &hyperlinkStyle = myDecoration.hyperlinkStyle();
+	if (!hyperlinkStyle.empty()) {
+		ZLTextBaseStyle &baseStyle = ZLTextStyleCollection::instance().baseStyle();
+		if (baseStyle.hasHyperlinkColorOption(hyperlinkStyle)) {
+			return baseStyle.hyperlinkColorOption(hyperlinkStyle).value();
+		}
 	}
-	ZLTextBaseStyle &baseStyle = ZLTextStyleCollection::instance().baseStyle();
-	if (hyperlinkStyle == ZLTextStyleDecoration::INTERNAL) {
-		return baseStyle.InternalHyperlinkTextColorOption.value();
+	return base()->color();
+}
+
+short ZLTextForcedStyle::lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const {
+	ZLTextStyleEntry::Length lengthType = rtl ?
+		ZLTextStyleEntry::LENGTH_RIGHT_INDENT :
+		ZLTextStyleEntry::LENGTH_LEFT_INDENT;
+	return
+		myEntry.lengthSupported(lengthType) ?
+			myEntry.length(lengthType, metrics) :
+			base()->lineStartIndent(metrics, rtl);
+}
+
+short ZLTextForcedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const {
+	ZLTextStyleEntry::Length lengthType = rtl ?
+		ZLTextStyleEntry::LENGTH_LEFT_INDENT :
+		ZLTextStyleEntry::LENGTH_RIGHT_INDENT;
+	return
+		myEntry.lengthSupported(lengthType) ?
+			myEntry.length(lengthType, metrics) :
+			base()->lineEndIndent(metrics, rtl);
+}
+
+short ZLTextForcedStyle::spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const {
+	return
+		myEntry.lengthSupported(ZLTextStyleEntry::LENGTH_SPACE_BEFORE) ?
+			myEntry.length(ZLTextStyleEntry::LENGTH_SPACE_BEFORE, metrics) :
+			base()->spaceBefore(metrics);
+}
+
+short ZLTextForcedStyle::spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const {
+	return
+		myEntry.lengthSupported(ZLTextStyleEntry::LENGTH_SPACE_AFTER) ?
+			myEntry.length(ZLTextStyleEntry::LENGTH_SPACE_AFTER, metrics) :
+			base()->spaceAfter(metrics);
+}
+
+short ZLTextForcedStyle::firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const {
+	return
+		myEntry.lengthSupported(ZLTextStyleEntry::LENGTH_FIRST_LINE_INDENT_DELTA) ?
+			myEntry.length(ZLTextStyleEntry::LENGTH_FIRST_LINE_INDENT_DELTA, metrics) :
+			base()->firstLineIndentDelta(metrics);
+}
+
+ZLTextAlignmentType ZLTextForcedStyle::alignment() const {
+	return myEntry.alignmentTypeSupported() ? myEntry.alignmentType() : base()->alignment();
+}
+
+bool ZLTextForcedStyle::bold() const {
+	return myEntry.boldSupported() ? myEntry.bold() : base()->bold();
+}
+
+bool ZLTextForcedStyle::italic() const {
+	return myEntry.italicSupported() ? myEntry.italic() : base()->italic();
+}
+
+int ZLTextForcedStyle::fontSize() const {
+	if (myEntry.fontSizeSupported()) {
+		int size = ZLTextStyleCollection::instance().baseStyle().fontSize();
+		const int mag = myEntry.fontSizeMag();
+		if (mag >= 0) {
+			for (int i = 0; i < mag; ++i) {
+				size *= 6;
+			}
+			for (int i = 0; i < mag; ++i) {
+				size /= 5;
+			}
+		} else {
+			for (int i = 0; i > mag; --i) {
+				size *= 5;
+			}
+			for (int i = 0; i > mag; --i) {
+				size /= 6;
+			}
+		}
+		return size;
 	} else {
-		return baseStyle.ExternalHyperlinkTextColorOption.value();
+		return base()->fontSize();
 	}
 }
 
-int ZLTextForcedStyle::leftIndent() const {
-	return myEntry.leftIndentSupported() ? myEntry.leftIndent() : base()->leftIndent();
+const std::string &ZLTextForcedStyle::fontFamily() const {
+	return (!ZLTextStyleCollection::instance().OverrideSpecifiedFontsOption.value() &&
+					myEntry.fontFamilySupported()) ?
+						myEntry.fontFamily() : base()->fontFamily();
 }
 
-int ZLTextForcedStyle::rightIndent() const {
-	return myEntry.rightIndentSupported() ? myEntry.rightIndent() : base()->rightIndent();
+const std::string &ZLTextStyleDecoration::hyperlinkStyle() const {
+	return myHyperlinkStyle;
 }
 
-ZLTextAlignmentType ZLTextForcedStyle::alignment() const {
-	return myEntry.alignmentTypeSupported() ? myEntry.alignmentType() : base()->alignment();
+void ZLTextStyleDecoration::setHyperlinkStyle(const std::string &hyperlinkStyle) {
+	myHyperlinkStyle = hyperlinkStyle;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextDrawTreeLines.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextDrawTreeLines.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextDrawTreeLines.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextDrawTreeLines.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,52 +24,51 @@
 #include "ZLTextView.h"
 #include "ZLTextLineInfo.h"
 
-void ZLTextView::drawTreeLines(const ZLTextTreeNodeInfo &info, int height, int vSpaceAfter) {
+void ZLTextView::drawTreeLines(const ZLTextTreeNodeInfo &info, int x, int y, int height, int vSpaceAfter) {
 	context().setColor(ZLTextStyleCollection::instance().baseStyle().TreeLinesColorOption.value());
 
-	int x = context().x();
-	int y = context().y();
-
 	const int qstep = (context().stringHeight() + 2) / 3;
 
 	const std::vector<bool> &Stack = info.VerticalLinesStack;
 	const int depth = Stack.size();
 	for (int i = depth - 1; i >= 0; --i) {
 		if (Stack[i]) {
-			context().drawLine(x + 2 * qstep, y + vSpaceAfter, x + 2 * qstep, y - height + 1);
+			context().drawLine(visualX(x + 2 * qstep), y + vSpaceAfter, visualX(x + 2 * qstep), y - height + 1);
 		}
 		x += 4 * qstep;
 	}
 
 	if (info.IsFirstLine) {
 		if ((depth > 0) && !Stack[0]) {
-			context().drawLine(x - 2 * qstep, y - qstep, x - 2 * qstep, y - height + 1);
+			context().drawLine(visualX(x - 2 * qstep), y - qstep, visualX(x - 2 * qstep), y - height + 1);
 		}
 
 		if (info.IsLeaf) {
 			if (depth > 0) {
-				context().drawLine(x - 2 * qstep, y - qstep, x + 3 * qstep, y - qstep);
+				context().drawLine(visualX(x - 2 * qstep), y - qstep, visualX(x + 3 * qstep), y - qstep);
 			}
 		} else {
 			int space = std::max(qstep * 2 / 5, 2);
 			if (depth > 0) {
-				context().drawLine(x - 2 * qstep, y - qstep, x + qstep, y - qstep);
+				context().drawLine(visualX(x - 2 * qstep), y - qstep, visualX(x + qstep), y - qstep);
 			}
 			const int x0 = x + qstep, x1 = x + 3 * qstep;
 			const int y0 = y, y1 = y - 2 * qstep;
-			context().drawLine(x0, y0, x0, y1);
-			context().drawLine(x1, y0, x1, y1);
-			context().drawLine(x0, y0, x1, y0);
-			context().drawLine(x0, y1, x1, y1);
-			context().drawLine(x0 + space, y - qstep, x1 - space, y - qstep);
+			context().drawLine(visualX(x0), y0, visualX(x0), y1);
+			context().drawLine(visualX(x1), y0, visualX(x1), y1);
+			context().drawLine(visualX(x0), y0, visualX(x1), y0);
+			context().drawLine(visualX(x0), y1, visualX(x1), y1);
+			context().drawLine(visualX(x0 + space), y - qstep, visualX(x1 - space), y - qstep);
 			if (info.IsOpen) {
-				context().drawLine(x + 2 * qstep, y + vSpaceAfter, x + 2 * qstep, y);
+				context().drawLine(visualX(x + 2 * qstep), y + vSpaceAfter, visualX(x + 2 * qstep), y);
 			} else {
-				context().drawLine(x + 2 * qstep, y0 - space, x + 2 * qstep, y1 + space);
+				context().drawLine(visualX(x + 2 * qstep), y0 - space, visualX(x + 2 * qstep), y1 + space);
 			}
-			myTreeNodeMap.push_back(ZLTextTreeNodeArea(info.ParagraphNumber, x, x + 4 * qstep, y - height + 1, y));
+			const int left = std::min(visualX(x), visualX(x + 4 * qstep));
+			const int right = std::max(visualX(x), visualX(x + 4 * qstep));
+			myTreeNodeMap.push_back(ZLTextTreeNodeArea(info.ParagraphIndex, left, right, y - height + 1, y));
 		}
 	} else if (!info.IsLeaf && info.IsOpen) {
-		context().drawLine(x + 2 * qstep, y + vSpaceAfter, x + 2 * qstep, y - height + 1);
+		context().drawLine(visualX(x + 2 * qstep), y + vSpaceAfter, visualX(x + 2 * qstep), y - height + 1);
 	}
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextElement.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextElement.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextElement.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextElement.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLTextElement.h"
+
+ZLTextElement::Kind ZLTextImageElement::kind() const {
+	return IMAGE_ELEMENT;
+};
+
+ZLTextElement::Kind ZLTextSpecialElement::kind() const {
+	return myKind;
+};
+
+ZLTextElement::Kind ZLTextStyleElement::kind() const {
+	return FORCED_CONTROL_ELEMENT;
+};
+
+ZLTextElement::Kind ZLTextControlElement::kind() const {
+	return CONTROL_ELEMENT;
+};
+
+ZLTextElement::Kind ZLTextFixedHSpaceElement::kind() const {
+	return FIXED_HSPACE_ELEMENT;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextElement.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextElement.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextElement.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextElement.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,6 +45,8 @@
 		BEFORE_PARAGRAPH_ELEMENT,
 		AFTER_PARAGRAPH_ELEMENT,
 		EMPTY_LINE_ELEMENT,
+		START_REVERSED_SEQUENCE_ELEMENT,
+		END_REVERSED_SEQUENCE_ELEMENT,
 	};
 
 	virtual Kind kind() const = 0;
@@ -58,15 +60,17 @@
 class ZLTextImageElement : public ZLTextElement {
 
 public:
-	ZLTextImageElement(const std::string &id, const shared_ptr<ZLImageData> image);
+	ZLTextImageElement(const std::string &id, shared_ptr<ZLImageData> image);
 	~ZLTextImageElement();
-	Kind kind() const;
-	const ZLImageData &image() const;
+	shared_ptr<ZLImageData> image() const;
 	const std::string &id() const;
 
 private:
+	Kind kind() const;
+
+private:
 	const std::string myId;
-	const shared_ptr<ZLImageData> myImage;
+	shared_ptr<ZLImageData> myImage;
 };
 
 class ZLTextSpecialElement : public ZLTextElement {
@@ -74,19 +78,23 @@
 public:
 	ZLTextSpecialElement(Kind kind);
 	~ZLTextSpecialElement();
+
+private:
 	Kind kind() const;
 
 private:
 	Kind myKind;
 };
 
-class ZLTextForcedControlElement : public ZLTextElement {
+class ZLTextStyleElement : public ZLTextElement {
 
 public:
-	ZLTextForcedControlElement(shared_ptr<ZLTextParagraphEntry> entry);
-	~ZLTextForcedControlElement();
+	ZLTextStyleElement(shared_ptr<ZLTextParagraphEntry> entry);
+	~ZLTextStyleElement();
+	const ZLTextStyleEntry &entry() const;
+
+private:
 	Kind kind() const;
-	const ZLTextForcedControlEntry &entry() const;
 
 private:
 	const shared_ptr<ZLTextParagraphEntry> myEntry;
@@ -96,10 +104,12 @@
 
 public:
 	ZLTextFixedHSpaceElement(unsigned char length);
-	Kind kind() const;
 	unsigned char length() const;
 
 private:
+	Kind kind() const;
+
+private:
 	const unsigned char myLength;
 };
 
@@ -110,12 +120,14 @@
 	~ZLTextControlElement();
 
 public:
-	Kind kind() const;
 	const ZLTextControlEntry &entry() const;
 	ZLTextKind textKind() const;
 	bool isStart() const;
 
 private:
+	Kind kind() const;
+
+private:
 	const shared_ptr<ZLTextParagraphEntry> myEntry;
 
 friend class ZLTextElementPool;
@@ -126,28 +138,23 @@
 
 inline ZLTextImageElement::ZLTextImageElement(const std::string &id, const shared_ptr<ZLImageData> image) : myId(id), myImage(image) {}
 inline ZLTextImageElement::~ZLTextImageElement() {}
-inline ZLTextElement::Kind ZLTextImageElement::kind() const { return IMAGE_ELEMENT; };
-inline const ZLImageData &ZLTextImageElement::image() const { return *myImage; }
+inline shared_ptr<ZLImageData> ZLTextImageElement::image() const { return myImage; }
 inline const std::string &ZLTextImageElement::id() const { return myId; }
 
 inline ZLTextSpecialElement::ZLTextSpecialElement(Kind kind) : myKind(kind) {}
 inline ZLTextSpecialElement::~ZLTextSpecialElement() {}
-inline ZLTextElement::Kind ZLTextSpecialElement::kind() const { return myKind; };
 
-inline ZLTextForcedControlElement::ZLTextForcedControlElement(const shared_ptr<ZLTextParagraphEntry> entry) : myEntry(entry) {}
-inline ZLTextForcedControlElement::~ZLTextForcedControlElement() {}
-inline ZLTextElement::Kind ZLTextForcedControlElement::kind() const { return FORCED_CONTROL_ELEMENT; };
-inline const ZLTextForcedControlEntry &ZLTextForcedControlElement::entry() const { return (const ZLTextForcedControlEntry&)*myEntry; }
+inline ZLTextStyleElement::ZLTextStyleElement(const shared_ptr<ZLTextParagraphEntry> entry) : myEntry(entry) {}
+inline ZLTextStyleElement::~ZLTextStyleElement() {}
+inline const ZLTextStyleEntry &ZLTextStyleElement::entry() const { return (const ZLTextStyleEntry&)*myEntry; }
 
 inline ZLTextControlElement::ZLTextControlElement(const shared_ptr<ZLTextParagraphEntry> entry) : myEntry(entry) {}
 inline ZLTextControlElement::~ZLTextControlElement() {}
-inline ZLTextElement::Kind ZLTextControlElement::kind() const { return CONTROL_ELEMENT; };
 inline const ZLTextControlEntry &ZLTextControlElement::entry() const { return (const ZLTextControlEntry&)*myEntry; }
 inline ZLTextKind ZLTextControlElement::textKind() const { return entry().kind(); }
 inline bool ZLTextControlElement::isStart() const { return entry().isStart(); }
 
 inline ZLTextFixedHSpaceElement::ZLTextFixedHSpaceElement(unsigned char length) : myLength(length) {}
-inline ZLTextElement::Kind ZLTextFixedHSpaceElement::kind() const { return FIXED_HSPACE_ELEMENT; }
 inline unsigned char ZLTextFixedHSpaceElement::length() const { return myLength; }
 
 #endif /* __ZLTEXTELEMENT_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextLineInfo.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextLineInfo.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextLineInfo.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextLineInfo.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,24 +31,25 @@
 	bool IsLeaf;
 	bool IsOpen;
 	bool IsFirstLine;
-	int ParagraphNumber;
+	int ParagraphIndex;
 	std::vector<bool> VerticalLinesStack;
 };
 
 struct ZLTextLineInfo {
-	ZLTextLineInfo(const ZLTextWordCursor &word, ZLTextStylePtr style);
+	ZLTextLineInfo(const ZLTextWordCursor &word, ZLTextStylePtr style, unsigned char bidiLevel);
 
 	ZLTextWordCursor Start;
 	ZLTextWordCursor RealStart;
 	ZLTextWordCursor End;
 	bool IsVisible;
-	int LeftIndent;
+	int StartIndent;
 	int Width;
 	int Height;
 	int Descent;
 	int VSpaceAfter;
 	int SpaceCounter;
 	ZLTextStylePtr StartStyle;
+	unsigned char StartBidiLevel;
 	shared_ptr<ZLTextTreeNodeInfo> NodeInfo;
 
 private:
@@ -65,7 +66,7 @@
 	bool operator < (const ZLTextLineInfoPtr &info) const;
 };
 
-inline ZLTextLineInfo::ZLTextLineInfo(const ZLTextWordCursor &word, ZLTextStylePtr style) : Start(word), RealStart(word), End(word), IsVisible(false), LeftIndent(0), Width(0), Height(0), Descent(0), VSpaceAfter(0), SpaceCounter(0), StartStyle(style) {}
+inline ZLTextLineInfo::ZLTextLineInfo(const ZLTextWordCursor &word, ZLTextStylePtr style, unsigned char bidiLevel) : Start(word), RealStart(word), End(word), IsVisible(false), StartIndent(0), Width(0), Height(0), Descent(0), VSpaceAfter(0), SpaceCounter(0), StartStyle(style), StartBidiLevel(bidiLevel) {}
 
 inline ZLTextLineInfoPtr::ZLTextLineInfoPtr(ZLTextLineInfo *ptr) : shared_ptr<ZLTextLineInfo>(ptr) {}
 inline bool ZLTextLineInfoPtr::operator < (const ZLTextLineInfoPtr &info) const { return (*this)->Start < info->Start; }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextLineProcessor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextLineProcessor.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextLineProcessor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextLineProcessor.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 	//ZLTextWordCursor RealStart;
 	ZLTextWordCursor End;
 	bool IsVisible;
-	//int LeftIndent;
+	//int StartIndent;
 	int Width;
 	int Height;
 	int Descent;
@@ -63,7 +63,7 @@
 	const bool useHyphenator =
 		ZLTextStyleCollection::instance().baseStyle().AutoHyphenationOption.value();
 
-	ZLTextLineInfoPtr infoPtr = new ZLTextLineInfo(start, myStyle.textStyle());
+	ZLTextLineInfoPtr infoPtr = new ZLTextLineInfo(start, myStyle.textStyle(), myStyle.bidiLevel());
 
 	std::set<ZLTextLineInfoPtr>::const_iterator it = myLineInfoCache.find(infoPtr);
 	if (it != myLineInfoCache.end()) {
@@ -84,7 +84,7 @@
 		nodeInfo.IsLeaf = treeParagraph.children().empty();
 		nodeInfo.IsOpen = treeParagraph.isOpen();
 		nodeInfo.IsFirstLine = isFirstLine;
-		nodeInfo.ParagraphNumber = paragraphCursor.index();
+		nodeInfo.ParagraphIndex = paragraphCursor.index();
 
 		nodeInfo.VerticalLinesStack.reserve(treeParagraph.depth() - 1);
 		if (treeParagraph.depth() > 1) {
@@ -99,68 +99,58 @@
 	}
 
 	if (isFirstLine) {
-		ZLTextElement::Kind elementKind = paragraphCursor[current.wordNumber()].kind();
+		ZLTextElement::Kind elementKind = paragraphCursor[current.elementIndex()].kind();
 		while ((elementKind == ZLTextElement::CONTROL_ELEMENT) ||
 					 (elementKind == ZLTextElement::FORCED_CONTROL_ELEMENT)) {
-			const ZLTextElement &element = paragraphCursor[current.wordNumber()];
-			switch (elementKind) {
-				case ZLTextElement::CONTROL_ELEMENT:
-					myStyle.applyControl((const ZLTextControlElement&)element);
-					break;
-				case ZLTextElement::FORCED_CONTROL_ELEMENT:
-					myStyle.applyControl((const ZLTextForcedControlElement&)element);
-					break;
-				default:
-					break;
-			}
+			myStyle.applySingleControl(paragraphCursor[current.elementIndex()]);
 			current.nextWord();
-			if (current.equalWordNumber(end)) {
+			if (current.equalElementIndex(end)) {
 				break;
 			}
-			elementKind = paragraphCursor[current.wordNumber()].kind();
+			elementKind = paragraphCursor[current.elementIndex()].kind();
 		}
 		info.StartStyle = myStyle.textStyle();
+		info.StartBidiLevel = myStyle.bidiLevel();
 		info.RealStart = current;
 	}
 
 	ZLTextStylePtr storedStyle = myStyle.textStyle();
+	unsigned char storedBidiLevel = myStyle.bidiLevel();
 
-	info.LeftIndent = myStyle.textStyle()->leftIndent();
+	const int fontSize = myStyle.textStyle()->fontSize();
+	// TODO: change metrics at font change
+	const ZLTextStyleEntry::Metrics metrics(fontSize, fontSize / 2, viewWidth(), textAreaHeight());
+	info.StartIndent = myStyle.textStyle()->lineStartIndent(metrics, myStyle.baseIsRtl());
 	if (isFirstLine) {
-		info.LeftIndent += myStyle.textStyle()->firstLineIndentDelta();
+		info.StartIndent += myStyle.textStyle()->firstLineIndentDelta(metrics);
 	}
 	if (!info.NodeInfo.isNull()) {
-		info.LeftIndent += (myStyle.context().stringHeight() + 2) / 3 * 4 * (info.NodeInfo->VerticalLinesStack.size() + 1);
+		info.StartIndent += (myStyle.context().stringHeight() + 2) / 3 * 4 * (info.NodeInfo->VerticalLinesStack.size() + 1);
 	}
-	info.Width = info.LeftIndent;
+	info.Width = info.StartIndent;
 
-	if (info.RealStart.equalWordNumber(end)) {
+	if (info.RealStart.equalElementIndex(end)) {
 	  info.End = info.RealStart;
 		return infoPtr;
 	}
 
 	ZLTextPartialInfo newInfo(info, current);
 	bool allowBreakAtNBSpace = true;
-	const int maxWidth = viewWidth() - myStyle.textStyle()->rightIndent();
+	const int maxWidth = metrics.FullWidth - myStyle.textStyle()->lineEndIndent(metrics, myStyle.baseIsRtl());
 	bool wordOccured = false;
 	int lastSpaceWidth = 0;
 	int removeLastSpace = false;
 
-	ZLTextElement::Kind elementKind = paragraphCursor[newInfo.End.wordNumber()].kind();
+	ZLTextElement::Kind elementKind = paragraphCursor[newInfo.End.elementIndex()].kind();
 
 	bool breakedAtFirstWord = false;
 	do {
-		const ZLTextElement &element = paragraphCursor[newInfo.End.wordNumber()];
-		newInfo.Width += myStyle.elementWidth(element, newInfo.End.charNumber());
-		newInfo.Height = std::max(newInfo.Height, myStyle.elementHeight(element));
+		const ZLTextElement &element = paragraphCursor[newInfo.End.elementIndex()];
+		newInfo.Width += myStyle.elementWidth(element, newInfo.End.charIndex(), metrics);
+		newInfo.Height = std::max(newInfo.Height, myStyle.elementHeight(element, metrics));
 		newInfo.Descent = std::max(newInfo.Descent, myStyle.elementDescent(element));
+		myStyle.applySingleControl(element);
 		switch (elementKind) {
-			case ZLTextElement::CONTROL_ELEMENT:
-				myStyle.applyControl((const ZLTextControlElement&)element);
-				break;
-			case ZLTextElement::FORCED_CONTROL_ELEMENT:
-				myStyle.applyControl((const ZLTextForcedControlElement&)element);
-				break;
 			case ZLTextElement::WORD_ELEMENT:
 			case ZLTextElement::IMAGE_ELEMENT:
 				wordOccured = true;
@@ -177,12 +167,13 @@
 				break;
 			case ZLTextElement::EMPTY_LINE_ELEMENT:
 				newInfo.IsVisible = true;
+				break;
 			default:
 				break;
 		}
 
 		if (newInfo.Width > maxWidth) {
-			if (!info.End.equalWordNumber(start)) {
+			if (!info.End.equalElementIndex(start)) {
 				break;
 			}
 			if (useHyphenator && myStyle.textStyle()->allowHyphenations() &&
@@ -194,18 +185,25 @@
 
 		ZLTextElement::Kind previousKind = elementKind;
 		newInfo.End.nextWord();
-		bool allowBreak = newInfo.End.equalWordNumber(end);
+		bool allowBreak = newInfo.End.equalElementIndex(end);
 		bool nbspaceBreak = false;
 		if (!allowBreak) {
-			elementKind = paragraphCursor[newInfo.End.wordNumber()].kind();
+			elementKind = paragraphCursor[newInfo.End.elementIndex()].kind();
 			if (elementKind == ZLTextElement::NB_HSPACE_ELEMENT) {
 				if (allowBreakAtNBSpace) {
 					allowBreak = true;
 					nbspaceBreak = true;
 				}
+			} else if (elementKind == ZLTextElement::WORD_ELEMENT) {
+				allowBreak = previousKind == ZLTextElement::WORD_ELEMENT;
+			} else if ((elementKind == ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT) &&
+								 (previousKind == ZLTextElement::WORD_ELEMENT)) {
+				allowBreak = false;
+			} else if ((elementKind == ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT) &&
+								 (previousKind == ZLTextElement::WORD_ELEMENT)) {
+				allowBreak = false;
 			} else {
 				allowBreak =
-					((elementKind != ZLTextElement::WORD_ELEMENT) || (previousKind == ZLTextElement::WORD_ELEMENT)) &&
 					(elementKind != ZLTextElement::IMAGE_ELEMENT) &&
 					(elementKind != ZLTextElement::CONTROL_ELEMENT);
 			}
@@ -214,44 +212,46 @@
 			newInfo.setTo(info);
 			allowBreakAtNBSpace = nbspaceBreak;
 			storedStyle = myStyle.textStyle();
+			storedBidiLevel = myStyle.bidiLevel();
 			removeLastSpace = !wordOccured && (info.SpaceCounter > 0);
 		}
-	} while (!newInfo.End.equalWordNumber(end));
+	} while (!newInfo.End.equalElementIndex(end));
 
-	if (!newInfo.End.equalWordNumber(end) && useHyphenator &&
+	if (!newInfo.End.equalElementIndex(end) && useHyphenator &&
 		 myStyle.textStyle()->allowHyphenations()) {
-		const ZLTextElement &element = paragraphCursor[newInfo.End.wordNumber()];
+		const ZLTextElement &element = paragraphCursor[newInfo.End.elementIndex()];
 		if (element.kind() == ZLTextElement::WORD_ELEMENT) {
-			const int startCharNumber = newInfo.End.charNumber();
-			newInfo.Width -= myStyle.elementWidth(element, startCharNumber);
+			const int startCharIndex = newInfo.End.charIndex();
+			newInfo.Width -= myStyle.elementWidth(element, startCharIndex, metrics);
 			const ZLTextWord &word = (ZLTextWord&)element;
 			int spaceLeft = maxWidth - newInfo.Width;
 			if (breakedAtFirstWord ||
 					((word.Length > 3) && (spaceLeft > 2 * myStyle.context().spaceWidth()))) {
-				ZLUnicodeUtil::Ucs2String ucs2string;
-				ZLUnicodeUtil::utf8ToUcs2(ucs2string, word.Data, word.Size);
+				ZLUnicodeUtil::Ucs4String ucs4string;
+				ZLUnicodeUtil::utf8ToUcs4(ucs4string, word.Data, word.Size);
 				ZLTextHyphenationInfo hyphenationInfo = ZLTextHyphenator::instance().info(word);
 				int hyphenationPosition = word.Length - 1;
 				int subwordWidth = 0;
-				for (; hyphenationPosition > startCharNumber; --hyphenationPosition) {
+				for (; hyphenationPosition > startCharIndex; --hyphenationPosition) {
 					if (hyphenationInfo.isHyphenationPossible(hyphenationPosition)) {
-						subwordWidth = myStyle.wordWidth(word, startCharNumber, hyphenationPosition - startCharNumber, ucs2string[hyphenationPosition - 1] != '-');
+						subwordWidth = myStyle.wordWidth(word, startCharIndex, hyphenationPosition - startCharIndex, ucs4string[hyphenationPosition - 1] != '-');
 						if (subwordWidth <= spaceLeft) {
 							break;
 						}
 					}
 				}
-				if ((hyphenationPosition == startCharNumber) &&
-						(info.End.wordNumber() <= info.RealStart.wordNumber())) {
+				if ((hyphenationPosition == startCharIndex) &&
+						(info.End.elementIndex() <= info.RealStart.elementIndex())) {
 					hyphenationPosition = word.Length;
-					subwordWidth = myStyle.elementWidth(element, startCharNumber);
+					subwordWidth = myStyle.elementWidth(element, startCharIndex, metrics);
 				}
-				if (hyphenationPosition > startCharNumber) {
+				if (hyphenationPosition > startCharIndex) {
 					newInfo.Width += subwordWidth;
 					newInfo.setTo(info);
 					storedStyle = myStyle.textStyle();
+					storedBidiLevel = myStyle.bidiLevel();
 					removeLastSpace = false;
-					info.End.setCharNumber(hyphenationPosition);
+					info.End.setCharIndex(hyphenationPosition);
 				}
 			}
 		}
@@ -262,16 +262,16 @@
 		--info.SpaceCounter;
 	}
 
-	myStyle.setTextStyle(storedStyle);
+	myStyle.setTextStyle(storedStyle, storedBidiLevel);
 
 	if (isFirstLine) {
-		info.Height += info.StartStyle->spaceBefore();
+		info.Height += info.StartStyle->spaceBefore(metrics);
 	}
 	if (info.End.isEndOfParagraph()) {
-		info.VSpaceAfter = myStyle.textStyle()->spaceAfter();
+		info.VSpaceAfter = myStyle.textStyle()->spaceAfter(metrics);
 	}
 
-	if (!info.End.equalWordNumber(end) || end.isEndOfParagraph()) {
+	if (!info.End.equalElementIndex(end) || end.isEndOfParagraph()) {
 		myLineInfoCache.insert(infoPtr);
 	}
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextPaintInfo.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextPaintInfo.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextPaintInfo.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextPaintInfo.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,11 +27,16 @@
 		return;
 	}
 
+	if ((myPaintState == TO_SCROLL_FORWARD) || (myPaintState == TO_SCROLL_BACKWARD)) {
+		preparePaintInfo();
+	}
+
 	myLineInfos.clear();
 	if (strong) {
 		ZLTextParagraphCursorCache::clear();
 		myLineInfoCache.clear();
 	}
+
 	if (!myStartCursor.isNull()) {
 		if (strong) {
 			myStartCursor.rebuild();
@@ -53,7 +58,7 @@
 	myPaintState = myStartCursor.isNull() ? NOTHING_TO_PAINT : START_IS_KNOWN;
 }
 
-void ZLTextView::moveStartCursor(int paragraphNumber, int wordNumber, int charNumber) {
+void ZLTextView::moveStartCursor(int paragraphIndex, int elementIndex, int charIndex) {
 	if (myPaintState == NOTHING_TO_PAINT) {
 		return;
 	}
@@ -61,14 +66,14 @@
 	if (myStartCursor.isNull()) {
 		myStartCursor = myEndCursor;
 	}
-	myStartCursor.moveToParagraph(paragraphNumber);
-	myStartCursor.moveTo(wordNumber, charNumber);
+	myStartCursor.moveToParagraph(paragraphIndex);
+	myStartCursor.moveTo(elementIndex, charIndex);
 	myEndCursor = 0;
 	myLineInfos.clear();
 	myPaintState = START_IS_KNOWN;
 }
 
-void ZLTextView::moveEndCursor(int paragraphNumber, int wordNumber, int charNumber) {
+void ZLTextView::moveEndCursor(int paragraphIndex, int elementIndex, int charIndex) {
 	if (myPaintState == NOTHING_TO_PAINT) {
 		return;
 	}
@@ -76,12 +81,12 @@
 	if (myEndCursor.isNull()) {
 		myEndCursor = myStartCursor;
 	}
-	myEndCursor.moveToParagraph(paragraphNumber);
-	if ((paragraphNumber > 0) && (wordNumber == 0) && (charNumber == 0)) {
+	myEndCursor.moveToParagraph(paragraphIndex);
+	if ((paragraphIndex > 0) && (elementIndex == 0) && (charIndex == 0)) {
 		myEndCursor.previousParagraph();
 		myEndCursor.moveToParagraphEnd();
 	} else {
-		myEndCursor.moveTo(wordNumber, charNumber);
+		myEndCursor.moveTo(elementIndex, charIndex);
 	}
 	myStartCursor = 0;
 	myLineInfos.clear();
@@ -164,6 +169,7 @@
 	if ((myPaintState == NOTHING_TO_PAINT) || (myPaintState == READY)) {
 		return;
 	}
+	myDoUpdateScrollbar = true;
 
 	myLineInfoCache.insert(myLineInfos.begin(), myLineInfos.end());
 
@@ -245,6 +251,16 @@
 			break;
 		case START_IS_KNOWN:
 			myEndCursor = buildInfos(myStartCursor);
+			if (pageIsEmpty()) {
+				ZLTextWordCursor startCursor = findLineFromStart(1);
+				if (!startCursor.isNull()) {
+					myStartCursor = startCursor;
+					if (myStartCursor.isEndOfParagraph()) {
+						myStartCursor.nextParagraph();
+					}
+					myEndCursor = buildInfos(myStartCursor);
+				}
+			}
 			break;
 		case END_IS_KNOWN:
 			myStartCursor = findStart(myEndCursor, PIXEL_UNIT, textAreaHeight());
@@ -303,7 +319,7 @@
 
 		myStyle.reset();
 		myStyle.applyControls(paragraphStart, cursor);
-		ZLTextLineInfoPtr infoPtr = new ZLTextLineInfo(cursor, myStyle.textStyle());
+		ZLTextLineInfoPtr infoPtr = new ZLTextLineInfo(cursor, myStyle.textStyle(), myStyle.bidiLevel());
 
 		while (!infoPtr->End.isEndOfParagraph()) {
 			infoPtr = processTextLine(infoPtr->End, paragraphEnd);
@@ -336,7 +352,7 @@
 
 	int size = 0;
 
-	while (!word.equalWordNumber(end)) {
+	while (!word.equalElementIndex(end)) {
 		const ZLTextLineInfoPtr info = processTextLine(word, end);
 		word = info->End;
 		size += infoSize(*info, unit);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphBuilder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphBuilder.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphBuilder.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphBuilder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <algorithm>
+
+#include <linebreak.h>
+
+#include <ZLLanguageUtil.h>
+#include <ZLImage.h>
+
+#include <ZLTextParagraph.h>
+
+#include "ZLTextParagraphCursor.h"
+#include "ZLTextWord.h"
+#include "ZLTextParagraphBuilder.h"
+
+ZLTextParagraphBuilder::ZLTextParagraphBuilder(const std::string &language, const ZLTextParagraph &paragraph, const std::vector<ZLTextMark> &marks, int paragraphIndex, ZLTextElementVector &elements) : myParagraph(paragraph), myElements(elements), myLanguage(language), myBaseBidiLevel(ZLLanguageUtil::isRTLLanguage(language) ? 1 : 0) {
+	myFirstMark = std::lower_bound(marks.begin(), marks.end(), ZLTextMark(paragraphIndex, 0, 0));
+	myLastMark = myFirstMark;
+	for (; (myLastMark != marks.end()) && (myLastMark->ParagraphIndex == paragraphIndex); ++myLastMark) {
+	}
+	myOffset = 0;
+
+	static bool lineBreakInitialized = false;
+	if (!lineBreakInitialized) {
+		init_linebreak();
+		lineBreakInitialized = true;
+	}
+}
+
+void ZLTextParagraphBuilder::updateBidiLevel(FriBidiLevel bidiLevel) {
+	while (myCurrentBidiLevel > bidiLevel) {
+		--myCurrentBidiLevel;
+		myElements.push_back(ZLTextElementPool::Pool.EndReversedSequenceElement);
+	}
+	while (myCurrentBidiLevel < bidiLevel) {
+		++myCurrentBidiLevel;
+		myElements.push_back(ZLTextElementPool::Pool.StartReversedSequenceElement);
+	}
+}
+
+void ZLTextParagraphBuilder::addWord(const char *ptr, int offset, int len) {
+	ZLTextWord *word = ZLTextElementPool::Pool.getWord(ptr, len, offset, myCurrentBidiLevel);
+	for (std::vector<ZLTextMark>::const_iterator mit = myFirstMark; mit != myLastMark; ++mit) {
+		ZLTextMark mark = *mit;
+		if ((mark.Offset < offset + len) && (mark.Offset + mark.Length > offset)) {
+			word->addMark(mark.Offset - offset, mark.Length);
+		}
+	}
+	myElements.push_back(word);
+}
+
+void ZLTextParagraphBuilder::fill() {
+	myBidiCharType = (myBaseBidiLevel == 1) ? FRIBIDI_TYPE_RTL : FRIBIDI_TYPE_LTR;
+	myCurrentBidiLevel = myBaseBidiLevel;
+	myLatestBidiLevel = myBaseBidiLevel;
+
+	for (ZLTextParagraph::Iterator it = myParagraph; !it.isEnd(); it.next()) {
+		switch (it.entryKind()) {
+			case ZLTextParagraphEntry::STYLE_ENTRY:
+				myElements.push_back(new ZLTextStyleElement(it.entry()));
+				break;
+			case ZLTextParagraphEntry::FIXED_HSPACE_ENTRY:
+				myElements.push_back(new ZLTextFixedHSpaceElement(((ZLTextFixedHSpaceEntry&)*it.entry()).length()));
+				break;
+			case ZLTextParagraphEntry::CONTROL_ENTRY:
+			case ZLTextParagraphEntry::HYPERLINK_CONTROL_ENTRY:
+				myElements.push_back(ZLTextElementPool::Pool.getControlElement(it.entry()));
+				break;
+			case ZLTextParagraphEntry::IMAGE_ENTRY:
+			{
+				ImageEntry &imageEntry = (ImageEntry&)*it.entry();
+				shared_ptr<const ZLImage> image = imageEntry.image();
+				if (!image.isNull()) {
+					shared_ptr<ZLImageData> data = ZLImageManager::instance().imageData(*image);
+					if (!data.isNull()) {
+						myElements.push_back(new ZLTextImageElement(imageEntry.id(), data));
+					}
+				}
+				break;
+			}
+			case ZLTextParagraphEntry::TEXT_ENTRY:
+				processTextEntry((const ZLTextEntry&)*it.entry());
+				break;
+			case ZLTextParagraphEntry::RESET_BIDI_ENTRY:
+				updateBidiLevel(myBaseBidiLevel);
+				myLatestBidiLevel = myBaseBidiLevel;
+				break;
+		}
+	}
+
+	updateBidiLevel(myBaseBidiLevel);
+}
+
+void ZLTextParagraphBuilder::processTextEntry(const ZLTextEntry &textEntry) {
+	const size_t dataLength = textEntry.dataLength();
+	if (dataLength == 0) {
+		return;
+	}
+
+	myUcs4String.clear();
+	ZLUnicodeUtil::utf8ToUcs4(myUcs4String, textEntry.data(), dataLength);
+	int len = myUcs4String.size();
+	myUcs4String.push_back(0);
+	myBidiLevels.clear();
+	myBidiLevels.assign(len + 1, 0);
+	int firstNonSpace = 0;
+	while ((firstNonSpace < len) &&
+				 ZLUnicodeUtil::isSpace(myUcs4String[firstNonSpace])) {
+		myBidiLevels[firstNonSpace++] = myLatestBidiLevel;
+	}
+	int lastNonSpace = len - 1;
+	if (lastNonSpace > firstNonSpace - 1) {
+		while (ZLUnicodeUtil::isSpace(myUcs4String[lastNonSpace])) {
+			--lastNonSpace;
+		}
+		fribidi_log2vis((FriBidiChar*)&myUcs4String[firstNonSpace], lastNonSpace - firstNonSpace + 1, &myBidiCharType, 0, 0, 0, &myBidiLevels[firstNonSpace]);
+	}
+	myLatestBidiLevel = myBidiLevels[lastNonSpace];
+	for (int i = lastNonSpace; i < len; ++i) {
+		myBidiLevels[i] = myLatestBidiLevel;
+	}
+
+	myBreaksTable.clear();
+	myBreaksTable.assign(dataLength, 0);
+	const char *start = textEntry.data();
+	const char *end = start + dataLength;
+	set_linebreaks_utf8((const utf8_t*)start, dataLength, myLanguage.c_str(), &myBreaksTable[0]);
+
+	ZLUnicodeUtil::Ucs4Char ch = 0, previousCh;
+	enum { NO_SPACE, SPACE, NON_BREAKABLE_SPACE } spaceState = NO_SPACE;
+	int charLength = 0;
+	int index = 0;
+	const char *wordStart = start;
+	updateBidiLevel(myBidiLevels[0]);
+	for (const char *ptr = start; ptr < end; ptr += charLength, ++index) {
+		previousCh = ch;
+		charLength = ZLUnicodeUtil::firstChar(ch, ptr);
+		if (ZLUnicodeUtil::isSpace(ch)) {
+			if ((spaceState == NO_SPACE) && (ptr != wordStart)) {
+				addWord(wordStart, myOffset + (wordStart - start), ptr - wordStart);
+			}
+			spaceState = SPACE;
+		} else if (ZLUnicodeUtil::isNBSpace(ch)) {
+			if (spaceState == NO_SPACE) {
+				if (ptr != wordStart) {
+					addWord(wordStart, myOffset + (wordStart - start), ptr - wordStart);
+				}
+				spaceState = NON_BREAKABLE_SPACE;
+			}
+		} else {
+			switch (spaceState) {
+				case SPACE:
+					if ((myBreaksTable[ptr - start - 1] == LINEBREAK_NOBREAK) || (previousCh == '-')) {
+						myElements.push_back(ZLTextElementPool::Pool.NBHSpaceElement);
+					} else {
+						myElements.push_back(ZLTextElementPool::Pool.HSpaceElement);
+					}
+					wordStart = ptr;
+					break;
+				case NON_BREAKABLE_SPACE:
+					myElements.push_back(ZLTextElementPool::Pool.NBHSpaceElement);
+					wordStart = ptr;
+					break;
+				case NO_SPACE:
+					if ((ptr > start) &&
+							((((myBreaksTable[ptr - start - 1] != LINEBREAK_NOBREAK) && (previousCh != '-')) && (ptr != wordStart)) ||
+							 (myBidiLevels[index - 1] != myBidiLevels[index]))) {
+						addWord(wordStart, myOffset + (wordStart - start), ptr - wordStart);
+						wordStart = ptr;
+					}
+					break;
+			}
+			spaceState = NO_SPACE;
+		}
+		updateBidiLevel(myBidiLevels[index]);
+	}
+	switch (spaceState) {
+		case SPACE:
+			myElements.push_back(ZLTextElementPool::Pool.HSpaceElement);
+			break;
+		case NON_BREAKABLE_SPACE:
+			myElements.push_back(ZLTextElementPool::Pool.NBHSpaceElement);
+			break;
+		case NO_SPACE:
+			addWord(wordStart, myOffset + (wordStart - start), end - wordStart);
+			break;
+	}
+	myOffset += dataLength;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphBuilder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphBuilder.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphBuilder.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphBuilder.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLTEXTPARAGRAPHBUILDER_H__
+#define __ZLTEXTPARAGRAPHBUILDER_H__
+
+#include <vector>
+#include <string>
+
+#include <fribidi/fribidi.h>
+
+#include <ZLUnicodeUtil.h>
+
+#include "ZLTextElement.h"
+
+class ZLTextParagraph;
+
+class ZLTextParagraphBuilder {
+
+public:
+	ZLTextParagraphBuilder(const std::string &language, const ZLTextParagraph &paragraph, const std::vector<ZLTextMark> &marks, int index, ZLTextElementVector &elements);
+	void fill();
+
+private:
+	void processTextEntry(const ZLTextEntry &textEntry);
+	void addWord(const char *ptr, int offset, int len);
+	void updateBidiLevel(FriBidiLevel bidiLevel);
+	void insertRSElement();
+
+private:
+	const ZLTextParagraph &myParagraph;
+	ZLTextElementVector &myElements;
+
+	std::vector<ZLTextMark>::const_iterator myFirstMark;
+	std::vector<ZLTextMark>::const_iterator myLastMark;
+	int myOffset;
+
+	const std::string myLanguage;
+
+	std::vector<char> myBreaksTable;
+
+	FriBidiCharType myBidiCharType;
+	ZLUnicodeUtil::Ucs4String myUcs4String;
+	std::vector<FriBidiLevel> myBidiLevels;
+	const FriBidiLevel myBaseBidiLevel;
+	FriBidiLevel myCurrentBidiLevel;
+	FriBidiLevel myLatestBidiLevel;
+};
+
+#endif /* __ZLTEXTPARAGRAPHBUILDER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphCursor.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphCursor.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphCursor.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphCursor.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,10 @@
 #include <algorithm>
 
 #include <ZLTextParagraph.h>
-#include <ZLTextHyphenator.h>
 
 #include "ZLTextParagraphCursor.h"
 #include "ZLTextWord.h"
+#include "ZLTextParagraphBuilder.h"
 
 ZLTextElementPool ZLTextElementPool::Pool;
 
@@ -50,6 +50,8 @@
 			case ZLTextElement::BEFORE_PARAGRAPH_ELEMENT:
 			case ZLTextElement::AFTER_PARAGRAPH_ELEMENT:
 			case ZLTextElement::EMPTY_LINE_ELEMENT:
+			case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+			case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
 				break;
 		}
 	}
@@ -61,6 +63,8 @@
 	BeforeParagraphElement = new ZLTextSpecialElement(ZLTextElement::BEFORE_PARAGRAPH_ELEMENT);
 	AfterParagraphElement = new ZLTextSpecialElement(ZLTextElement::AFTER_PARAGRAPH_ELEMENT);
 	EmptyLineElement = new ZLTextSpecialElement(ZLTextElement::EMPTY_LINE_ELEMENT);
+	StartReversedSequenceElement = new ZLTextSpecialElement(ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT);
+	EndReversedSequenceElement = new ZLTextSpecialElement(ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT);
 }
 
 ZLTextElementPool::~ZLTextElementPool() {
@@ -69,22 +73,24 @@
 	delete BeforeParagraphElement;
 	delete AfterParagraphElement;
 	delete EmptyLineElement;
+	delete StartReversedSequenceElement;
+	delete EndReversedSequenceElement;
 }
 
-ZLTextParagraphCursorPtr ZLTextParagraphCursor::cursor(const ZLTextModel &model, size_t index) {
+ZLTextParagraphCursorPtr ZLTextParagraphCursor::cursor(const ZLTextModel &model, const std::string &language, size_t index) {
 	ZLTextParagraphCursorPtr result = ZLTextParagraphCursorCache::get(model[index]);
 	if (result.isNull()) {
 		if (model.kind() == ZLTextModel::TREE_MODEL) {
-			result = new ZLTextTreeParagraphCursor((const ZLTextTreeModel&)model, index);
+			result = new ZLTextTreeParagraphCursor((const ZLTextTreeModel&)model, language, index);
 		} else {
-			result = new ZLTextPlainParagraphCursor((const ZLTextPlainModel&)model, index);
+			result = new ZLTextPlainParagraphCursor((const ZLTextPlainModel&)model, language, index);
 		}
 		ZLTextParagraphCursorCache::put(model[index], result);
 	}
 	return result;
 }
 
-ZLTextParagraphCursor::ZLTextParagraphCursor(const ZLTextModel &model, size_t index) : myModel(model) {
+ZLTextParagraphCursor::ZLTextParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index) : myModel(model), myLanguage(language) {
 	myIndex = std::min(index, myModel.paragraphsNumber() - 1);
 	fill();
 }
@@ -93,7 +99,7 @@
 }
 
 ZLTextParagraphCursorPtr ZLTextPlainParagraphCursor::previous() const {
-	return isFirst() ? 0 : cursor(myModel, myIndex - 1);
+	return isFirst() ? 0 : cursor(myModel, myLanguage, myIndex - 1);
 }
 
 ZLTextParagraphCursorPtr ZLTextTreeParagraphCursor::previous() const {
@@ -115,11 +121,11 @@
 			--index;
 		}
 	}
-	return cursor(myModel, index);
+	return cursor(myModel, myLanguage, index);
 }
 
 ZLTextParagraphCursorPtr ZLTextPlainParagraphCursor::next() const {
-	return isLast() ? 0 : cursor(myModel, myIndex + 1);
+	return isLast() ? 0 : cursor(myModel, myLanguage, myIndex + 1);
 }
 
 ZLTextParagraphCursorPtr ZLTextTreeParagraphCursor::next() const {
@@ -128,7 +134,7 @@
 	}
 	const ZLTextTreeParagraph *current = (const ZLTextTreeParagraph*)myModel[myIndex];
 	if (!current->children().empty() && current->isOpen()) {
-		return cursor(myModel, myIndex + 1);
+		return cursor(myModel, myLanguage, myIndex + 1);
 	}
 
 	const ZLTextTreeParagraph *parent = current->parent();
@@ -141,7 +147,7 @@
 		while (((const ZLTextTreeParagraph*)myModel[index])->parent() != parent) {
 			++index;
 		}
-		return cursor(myModel, index);
+		return cursor(myModel, myLanguage, index);
 	}
 	return 0;
 }
@@ -189,12 +195,12 @@
 	}
 	const ZLTextParagraphCursor &paragraph = *myParagraphCursor;
 	size_t paragraphLength = paragraph.paragraphLength();
-	unsigned int wordNumber = myWordNumber;
-	while ((wordNumber != paragraphLength) && (paragraph[wordNumber].kind() != ZLTextElement::WORD_ELEMENT)) {
-		++wordNumber;
+	unsigned int elementIndex = myElementIndex;
+	while ((elementIndex != paragraphLength) && (paragraph[elementIndex].kind() != ZLTextElement::WORD_ELEMENT)) {
+		++elementIndex;
 	}
-	if (wordNumber != paragraphLength) {
-		return ZLTextMark(paragraph.index(), ((ZLTextWord&)paragraph[wordNumber]).ParagraphOffset, 0);
+	if (elementIndex != paragraphLength) {
+		return ZLTextMark(paragraph.index(), ((ZLTextWord&)paragraph[elementIndex]).ParagraphOffset, 0);
 	}
 	return ZLTextMark(paragraph.index() + 1, 0, 0);
 }
@@ -211,8 +217,8 @@
 		case ZLTextParagraph::TEXT_PARAGRAPH:
 		case ZLTextParagraph::TREE_PARAGRAPH:
 		{
-			Processor processor(ZLTextHyphenator::instance().language(), paragraph, myModel.marks(), index(), myElements);
-			processor.fill();
+			ZLTextParagraphBuilder builder(myLanguage, paragraph, myModel.marks(), index(), myElements);
+			builder.fill();
 			break;
 		}
 		case ZLTextParagraph::EMPTY_LINE_PARAGRAPH:
@@ -268,49 +274,49 @@
 	}
 }
 
-void ZLTextWordCursor::setCharNumber(int charNumber) {
-	charNumber = std::max(charNumber, 0);
-	myCharNumber = 0;
-	if (charNumber > 0) {
-		const ZLTextElement &element = (*myParagraphCursor)[myWordNumber];
+void ZLTextWordCursor::setCharIndex(int charIndex) {
+	charIndex = std::max(charIndex, 0);
+	myCharIndex = 0;
+	if (charIndex > 0) {
+		const ZLTextElement &element = (*myParagraphCursor)[myElementIndex];
 		if (element.kind() == ZLTextElement::WORD_ELEMENT) {
-			if (charNumber <= (int)((const ZLTextWord&)element).Length) {
-				myCharNumber = charNumber;
+			if (charIndex <= (int)((const ZLTextWord&)element).Length) {
+				myCharIndex = charIndex;
 			}
 		}
 	}
 }
 
-void ZLTextWordCursor::moveTo(int wordNumber, int charNumber) {
+void ZLTextWordCursor::moveTo(int elementIndex, int charIndex) {
 	if (!isNull()) {
-		if ((wordNumber == 0) && (charNumber == 0)) {
-			myWordNumber = 0;
-			myCharNumber = 0;
+		if ((elementIndex == 0) && (charIndex == 0)) {
+			myElementIndex = 0;
+			myCharIndex = 0;
 		} else {
-			wordNumber = std::max(0, wordNumber);
+			elementIndex = std::max(0, elementIndex);
 			size_t size = myParagraphCursor->paragraphLength();
-			if ((size_t)wordNumber > size) {
-				myWordNumber = size;
-				myCharNumber = 0;
+			if ((size_t)elementIndex > size) {
+				myElementIndex = size;
+				myCharIndex = 0;
 			} else {
-				myWordNumber = wordNumber;
-				setCharNumber(charNumber);
+				myElementIndex = elementIndex;
+				setCharIndex(charIndex);
 			}
 		}
 	}
 }
 
 const ZLTextWordCursor &ZLTextWordCursor::operator = (ZLTextParagraphCursorPtr paragraphCursor) {
-	myWordNumber = 0;
-	myCharNumber = 0;
+	myElementIndex = 0;
+	myCharIndex = 0;
 	myParagraphCursor = paragraphCursor;
 	moveToParagraphStart();
 	return *this;
 }
 
-void ZLTextWordCursor::moveToParagraph(int paragraphNumber) {
-	if (!isNull() && (paragraphNumber != (int)myParagraphCursor->index())) {
-		myParagraphCursor = ZLTextParagraphCursor::cursor(myParagraphCursor->myModel, paragraphNumber);
+void ZLTextWordCursor::moveToParagraph(int paragraphIndex) {
+	if (!isNull() && (paragraphIndex != (int)myParagraphCursor->index())) {
+		myParagraphCursor = ZLTextParagraphCursor::cursor(myParagraphCursor->myModel, myParagraphCursor->myLanguage, paragraphIndex);
 		moveToParagraphStart();
 	}
 }
@@ -339,15 +345,15 @@
 
 void ZLTextWordCursor::moveToParagraphStart() {
 	if (!isNull()) {
-		myWordNumber = 0;
-		myCharNumber = 0;
+		myElementIndex = 0;
+		myCharIndex = 0;
 	}
 }
 
 void ZLTextWordCursor::moveToParagraphEnd() {
 	if (!isNull()) {
-		myWordNumber = myParagraphCursor->paragraphLength();
-		myCharNumber = 0;
+		myElementIndex = myParagraphCursor->paragraphLength();
+		myCharIndex = 0;
 	}
 }
 
@@ -356,7 +362,7 @@
 	int pn1 = cursor.myParagraphCursor->index();
 	if (pn0 < pn1) return true;
 	if (pn1 < pn0) return false;
-	if (myWordNumber < cursor.myWordNumber) return true;
-	if (myWordNumber > cursor.myWordNumber) return false;
-	return myCharNumber < cursor.myCharNumber;
+	if (myElementIndex < cursor.myElementIndex) return true;
+	if (myElementIndex > cursor.myElementIndex) return false;
+	return myCharIndex < cursor.myCharIndex;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphCursor.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphCursor.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextParagraphCursor.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextParagraphCursor.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@
 public:
 	static ZLTextElementPool Pool;
 
-public:
+private:
 	ZLTextElementPool();
 	~ZLTextElementPool();
 	
@@ -56,8 +56,10 @@
 	ZLTextElement *BeforeParagraphElement;
 	ZLTextElement *AfterParagraphElement;
 	ZLTextElement *EmptyLineElement;
+	ZLTextElement *StartReversedSequenceElement;
+	ZLTextElement *EndReversedSequenceElement;
 
-	ZLTextWord *getWord(const char *data, unsigned short length, size_t paragraphOffset);
+	ZLTextWord *getWord(const char *data, unsigned short length, size_t paragraphOffset, unsigned char bidiLevel);
 	void storeWord(ZLTextWord *word);
 	ZLTextControlElement *getControlElement(shared_ptr<ZLTextParagraphEntry> entry);
 	void storeControlElement(ZLTextControlElement *element);
@@ -72,39 +74,11 @@
 
 class ZLTextParagraphCursor {
 
-private:
-	class Processor {
-
-	private:
-		static bool ourIndexIsInitialised;
-
-	public:
-		Processor(const std::string &language, const ZLTextParagraph &paragraph, const std::vector<ZLTextMark> &marks, int index, ZLTextElementVector &elements);
-		virtual ~Processor();
-		void fill();
-
-	private:
-		void processTextEntry(const ZLTextEntry &textEntry);
-		void addWord(const char *ptr, int offset, int len);
-
-	private:
-		const ZLTextParagraph &myParagraph;
-		ZLTextElementVector &myElements;
-
-		std::vector<ZLTextMark>::const_iterator myFirstMark;
-		std::vector<ZLTextMark>::const_iterator myLastMark;
-		int myOffset;
-
-		const std::string myLanguage;
-		char *myBreaksTable;
-		size_t myBreaksTableLength;
-	};
-
 protected:
-	ZLTextParagraphCursor(const ZLTextModel &model, size_t index);
+	ZLTextParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index);
 
 public:
-	static ZLTextParagraphCursorPtr cursor(const ZLTextModel &model, size_t index = 0);
+	static ZLTextParagraphCursorPtr cursor(const ZLTextModel &model, const std::string &language, size_t index = 0);
 	virtual ~ZLTextParagraphCursor();
 
 	bool isFirst() const;
@@ -134,6 +108,7 @@
 	
 protected:
 	const ZLTextModel &myModel;
+	const std::string &myLanguage;
 	size_t myIndex;
 	ZLTextElementVector myElements;
 
@@ -167,15 +142,15 @@
 	const ZLTextWordCursor &operator = (ZLTextParagraphCursorPtr paragraphCursor);
 
 	bool isNull() const;
-	bool equalWordNumber(const ZLTextWordCursor &cursor) const;
+	bool equalElementIndex(const ZLTextWordCursor &cursor) const;
 	bool sameElementAs(const ZLTextWordCursor &cursor) const;
 	bool operator == (const ZLTextWordCursor &cursor) const;
 	bool operator != (const ZLTextWordCursor &cursor) const;
 	bool operator < (const ZLTextWordCursor &cursor) const;
 	bool isStartOfParagraph() const;
 	bool isEndOfParagraph() const;
-	unsigned int wordNumber() const;
-	unsigned int charNumber() const;
+	unsigned int elementIndex() const;
+	unsigned int charIndex() const;
 	const ZLTextElement &element() const;
 	ZLTextMark position() const;
 	ZLTextParagraphCursorPtr paragraphCursorPtr() const;
@@ -187,22 +162,22 @@
 	bool previousParagraph();
 	void moveToParagraphStart();
 	void moveToParagraphEnd();
-	void moveToParagraph(int paragraphNumber);
-	void moveTo(int wordNumber, int charNumber);
-	void setCharNumber(int charNumber);
+	void moveToParagraph(int paragraphIndex);
+	void moveTo(int elementIndex, int charIndex);
+	void setCharIndex(int charIndex);
 
 	void rebuild();
 
 private:
 	ZLTextParagraphCursorPtr myParagraphCursor;
-	unsigned int myWordNumber;
-	unsigned int myCharNumber;
+	unsigned int myElementIndex;
+	unsigned int myCharIndex;
 };
 
 class ZLTextPlainParagraphCursor : public ZLTextParagraphCursor {
 
 private:
-	ZLTextPlainParagraphCursor(const ZLTextModel &model, size_t index);
+	ZLTextPlainParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index);
 
 public:
 	~ZLTextPlainParagraphCursor();
@@ -217,7 +192,7 @@
 class ZLTextTreeParagraphCursor : public ZLTextParagraphCursor {
 
 private:
-	ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, size_t index);
+	ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, const std::string &language, size_t index);
 
 public:
 	~ZLTextTreeParagraphCursor();
@@ -231,8 +206,8 @@
 
 inline ZLTextElementVector::ZLTextElementVector() {}
 
-inline ZLTextWord *ZLTextElementPool::getWord(const char *data, unsigned short length, size_t paragraphOffset) {
-	return new (myWordAllocator.allocate()) ZLTextWord(data, length, paragraphOffset);
+inline ZLTextWord *ZLTextElementPool::getWord(const char *data, unsigned short length, size_t paragraphOffset, unsigned char bidiLevel) {
+	return new (myWordAllocator.allocate()) ZLTextWord(data, length, paragraphOffset, bidiLevel);
 }
 inline void ZLTextElementPool::storeWord(ZLTextWord *word) {
 	word->~ZLTextWord();
@@ -251,50 +226,50 @@
 inline const ZLTextParagraph &ZLTextParagraphCursor::paragraph() const { return *myModel[myIndex]; }
 inline size_t ZLTextParagraphCursor::paragraphLength() const { return myElements.size(); }
 
-inline ZLTextWordCursor::ZLTextWordCursor() : myWordNumber(0), myCharNumber(0) {}
-inline ZLTextWordCursor::ZLTextWordCursor(const ZLTextWordCursor &cursor) : myParagraphCursor(cursor.myParagraphCursor), myWordNumber(cursor.myWordNumber), myCharNumber(cursor.myCharNumber) {}
+inline ZLTextWordCursor::ZLTextWordCursor() : myElementIndex(0), myCharIndex(0) {}
+inline ZLTextWordCursor::ZLTextWordCursor(const ZLTextWordCursor &cursor) : myParagraphCursor(cursor.myParagraphCursor), myElementIndex(cursor.myElementIndex), myCharIndex(cursor.myCharIndex) {}
 inline const ZLTextWordCursor &ZLTextWordCursor::operator = (const ZLTextWordCursor &cursor) {
 	myParagraphCursor = cursor.myParagraphCursor;
-	myWordNumber = cursor.myWordNumber;
-	myCharNumber = cursor.myCharNumber;
+	myElementIndex = cursor.myElementIndex;
+	myCharIndex = cursor.myCharIndex;
 	return *this;
 }
 
 inline bool ZLTextWordCursor::isNull() const { return myParagraphCursor.isNull(); }
-inline bool ZLTextWordCursor::equalWordNumber(const ZLTextWordCursor &cursor) const {
-	return myWordNumber == cursor.myWordNumber;
+inline bool ZLTextWordCursor::equalElementIndex(const ZLTextWordCursor &cursor) const {
+	return myElementIndex == cursor.myElementIndex;
 }
 inline bool ZLTextWordCursor::sameElementAs(const ZLTextWordCursor &cursor) const {
-	return (myWordNumber == cursor.myWordNumber) && (myParagraphCursor->index() == cursor.myParagraphCursor->index());
+	return (myElementIndex == cursor.myElementIndex) && (myParagraphCursor->index() == cursor.myParagraphCursor->index());
 }
 inline bool ZLTextWordCursor::operator == (const ZLTextWordCursor &cursor) const {
 	return
 		(myParagraphCursor->index() == cursor.myParagraphCursor->index()) &&
-		(myWordNumber == cursor.myWordNumber) &&
-		(myCharNumber == cursor.myCharNumber);
+		(myElementIndex == cursor.myElementIndex) &&
+		(myCharIndex == cursor.myCharIndex);
 }
 inline bool ZLTextWordCursor::operator != (const ZLTextWordCursor &cursor) const {
 	return !operator == (cursor);
 }
-inline const ZLTextElement &ZLTextWordCursor::element() const { return (*myParagraphCursor)[myWordNumber]; }
+inline const ZLTextElement &ZLTextWordCursor::element() const { return (*myParagraphCursor)[myElementIndex]; }
 inline bool ZLTextWordCursor::isStartOfParagraph() const {
-	return (myWordNumber == 0) && (myCharNumber == 0);
+	return (myElementIndex == 0) && (myCharIndex == 0);
 }
 inline bool ZLTextWordCursor::isEndOfParagraph() const {
-	return myWordNumber == myParagraphCursor->paragraphLength();
+	return myElementIndex == myParagraphCursor->paragraphLength();
 }
-inline unsigned int ZLTextWordCursor::wordNumber() const { return myWordNumber; }
-inline unsigned int ZLTextWordCursor::charNumber() const { return myCharNumber; }
+inline unsigned int ZLTextWordCursor::elementIndex() const { return myElementIndex; }
+inline unsigned int ZLTextWordCursor::charIndex() const { return myCharIndex; }
 inline ZLTextParagraphCursorPtr ZLTextWordCursor::paragraphCursorPtr() const { return myParagraphCursor; }
 inline const ZLTextParagraphCursor &ZLTextWordCursor::paragraphCursor() const { return *myParagraphCursor; }
 
-inline void ZLTextWordCursor::nextWord() { ++myWordNumber; myCharNumber = 0; }
-inline void ZLTextWordCursor::previousWord() { --myWordNumber; myCharNumber = 0; }
+inline void ZLTextWordCursor::nextWord() { ++myElementIndex; myCharIndex = 0; }
+inline void ZLTextWordCursor::previousWord() { --myElementIndex; myCharIndex = 0; }
 
-inline ZLTextPlainParagraphCursor::ZLTextPlainParagraphCursor(const ZLTextModel &model, size_t index) : ZLTextParagraphCursor(model, index) {}
+inline ZLTextPlainParagraphCursor::ZLTextPlainParagraphCursor(const ZLTextModel &model, const std::string &language, size_t index) : ZLTextParagraphCursor(model, language, index) {}
 inline ZLTextPlainParagraphCursor::~ZLTextPlainParagraphCursor() {}
 
-inline ZLTextTreeParagraphCursor::ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, size_t index) : ZLTextParagraphCursor(model, index) {}
+inline ZLTextTreeParagraphCursor::ZLTextTreeParagraphCursor(const ZLTextTreeModel &model, const std::string &language, size_t index) : ZLTextParagraphCursor(model, language, index) {}
 inline ZLTextTreeParagraphCursor::~ZLTextTreeParagraphCursor() {}
 
 #endif /* __ZLTEXTPARAGRAPHCURSOR_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextPositionIndicator.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextPositionIndicator.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextPositionIndicator.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextPositionIndicator.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -84,7 +84,7 @@
 }
 
 int ZLTextView::PositionIndicator::bottom() const {
-	return context().height() - myTextView.bottomMargin();
+	return context().height() - myTextView.bottomMargin() - 1;
 }
 
 int ZLTextView::PositionIndicator::top() const {
@@ -92,11 +92,11 @@
 }
 
 int ZLTextView::PositionIndicator::left() const {
-	return myTextView.leftMargin();
+	return myTextView.lineStartMargin();
 }
 
 int ZLTextView::PositionIndicator::right() const {
-	return myTextView.leftMargin() + myTextView.viewWidth() - myExtraWidth - 1;
+	return myTextView.lineStartMargin() + myTextView.viewWidth() - myExtraWidth - 1;
 }
 
 const std::vector<size_t> &ZLTextView::PositionIndicator::textSize() const {
@@ -105,7 +105,7 @@
 
 size_t ZLTextView::PositionIndicator::startTextIndex() const {
 	std::vector<size_t>::const_iterator i = myTextView.nextBreakIterator();
-	return (i != myTextView.myTextBreaks.begin()) ? *(i - 1) : 0;
+	return (i != myTextView.myTextBreaks.begin()) ? *(i - 1) + 1 : 0;
 }
 
 size_t ZLTextView::PositionIndicator::endTextIndex() const {
@@ -119,36 +119,56 @@
 	context().setFont(baseStyle.fontFamily(), myInfo.fontSize(), false, false);
 	context().setColor(baseStyle.RegularTextColorOption.value());
 
-	int width = context().stringWidth(text.data(), text.length());
-	context().drawString(right() - width, bottom() - 2, text.data(), text.length());
-	myExtraWidth += text.length() * context().stringWidth("0", 1) + context().spaceWidth();
+	int width = context().stringWidth(text.data(), text.length(), false);
+	if (myTextView.visualX(0) == 0) {
+		context().drawString(right() - width, bottom() - 2, text.data(), text.length(), false);
+	} else {
+		context().drawString(myTextView.visualX(right()), bottom() - 2, text.data(), text.length(), false);
+	}
+	myExtraWidth += text.length() * context().stringWidth("0", 1, false) + context().spaceWidth();
 }
 
-size_t ZLTextView::PositionIndicator::sizeOfTextBeforeParagraph(size_t paragraphNumber) const {
-	return myTextView.myTextSize[paragraphNumber] - myTextView.myTextSize[startTextIndex()];
+size_t ZLTextView::PositionIndicator::sizeOfTextBeforeParagraph(size_t paragraphIndex) const {
+	if (myTextView.myModel->kind() == ZLTextModel::TREE_MODEL) {
+		ZLTextWordCursor cursor = myTextView.startCursor();
+		if (cursor.isNull()) {
+			cursor = myTextView.endCursor();
+		}
+		if (!cursor.isNull()) {
+			const ZLTextTreeModel &treeModel = (const ZLTextTreeModel&)*myTextView.myModel;
+			size_t sum = 0;
+			for (size_t i = 0; i < paragraphIndex; ++i) {
+				const ZLTextTreeParagraph *para = (const ZLTextTreeParagraph*)treeModel[i];
+				if (para->parent()->isOpen()) {
+					sum += sizeOfParagraph(i);
+				}
+			}
+			return sum;
+		}
+	}
+	return myTextView.myTextSize[paragraphIndex] - myTextView.myTextSize[startTextIndex()];
 }
 
-size_t ZLTextView::PositionIndicator::sizeOfParagraph(size_t paragraphNumber) const {
-	return myTextView.myTextSize[paragraphNumber + 1] - myTextView.myTextSize[paragraphNumber];
+size_t ZLTextView::PositionIndicator::sizeOfParagraph(size_t paragraphIndex) const {
+	return myTextView.myTextSize[paragraphIndex + 1] - myTextView.myTextSize[paragraphIndex];
 }
 
-size_t ZLTextView::PositionIndicator::sizeOfTextBeforeCursor() const {
-	ZLTextWordCursor endCursor = myTextView.endCursor();
-	const size_t paragraphNumber = endCursor.paragraphCursor().index();
-	const size_t paragraphLength = endCursor.paragraphCursor().paragraphLength();
+size_t ZLTextView::PositionIndicator::sizeOfTextBeforeCursor(const ZLTextWordCursor &cursor) const {
+	const size_t paragraphIndex = cursor.paragraphCursor().index();
+	const size_t paragraphLength = cursor.paragraphCursor().paragraphLength();
 
 	if (paragraphLength == 0) {
-		return sizeOfTextBeforeParagraph(paragraphNumber);
+		return sizeOfTextBeforeParagraph(paragraphIndex);
 	} else {
 		return
-			sizeOfTextBeforeParagraph(paragraphNumber) +
-			muldiv(sizeOfParagraph(paragraphNumber), endCursor.wordNumber(), paragraphLength);
+			sizeOfTextBeforeParagraph(paragraphIndex) +
+			muldiv(sizeOfParagraph(paragraphIndex), cursor.elementIndex(), paragraphLength);
 	}
 }
 
 std::string ZLTextView::PositionIndicator::textPositionString() const {
 	std::string buffer;
-	ZLStringUtil::appendNumber(buffer, 1 + sizeOfTextBeforeCursor() / 2048);
+	ZLStringUtil::appendNumber(buffer, 1 + sizeOfTextBeforeCursor(myTextView.endCursor()) / 2048);
 	buffer += '/';
 	ZLStringUtil::appendNumber(buffer, 1 + sizeOfTextBeforeParagraph(endTextIndex()) / 2048);
 
@@ -159,7 +179,7 @@
 
 	const std::vector<size_t> &textSizeVector = myTextView.myTextSize;
 	const size_t fullTextSize = textSizeVector[endTextIndex()] - textSizeVector[startTextIndex()];
-	ZLStringUtil::appendNumber(buffer, 100 * sizeOfTextBeforeCursor() / fullTextSize);
+	ZLStringUtil::appendNumber(buffer, 100 * sizeOfTextBeforeCursor(myTextView.endCursor()) / fullTextSize);
 
 	return buffer + '%';
 	*/
@@ -213,19 +233,21 @@
 
 	if (!isEndOfText) {
 		fillWidth =
-			muldiv(fillWidth, sizeOfTextBeforeCursor(), sizeOfTextBeforeParagraph(endTextIndex()));
+			muldiv(fillWidth, sizeOfTextBeforeCursor(myTextView.endCursor()), sizeOfTextBeforeParagraph(endTextIndex()));
 	}
 
 	context.setColor(baseStyle.RegularTextColorOption.value());
 	context.setFillColor(myInfo.color());
-	context.fillRectangle(left + 1, top + 1, left + fillWidth + 1, bottom - 1);
-	context.drawLine(left, top, right, top);
-	context.drawLine(left, bottom, right, bottom);
-	context.drawLine(left, bottom, left, top);
-	context.drawLine(right, bottom, right, top);
+	context.fillRectangle(myTextView.visualX(left + 1), top + 1, myTextView.visualX(left + fillWidth + 1), bottom - 1);
+	context.drawLine(myTextView.visualX(left), top, myTextView.visualX(right), top);
+	context.drawLine(myTextView.visualX(left), bottom, myTextView.visualX(right), bottom);
+	context.drawLine(myTextView.visualX(left), bottom, myTextView.visualX(left), top);
+	context.drawLine(myTextView.visualX(right), bottom, myTextView.visualX(right), top);
 }
 
 bool ZLTextView::PositionIndicator::onStylusPress(int x, int y) {
+	x = myTextView.visualX(x);
+
 	const long bottom = this->bottom();
 	const long top = this->top();
 	const long left = this->left();
@@ -243,26 +265,11 @@
 	if (myTextView.endCursor().isNull()) {
 		return false;
 	}
-	const size_t startIndex = startTextIndex();
-	const size_t endIndex = endTextIndex();
+	size_t fullTextSize = sizeOfTextBeforeParagraph(endTextIndex());
+	size_t textSize = muldiv(fullTextSize, x - left + 1, right - left + 1);
+
+	myTextView.gotoCharIndex(textSize);
 
-	size_t fullTextSize = textSizeVector[endIndex] - textSizeVector[startIndex];
-	size_t textSize = muldiv(fullTextSize, x - left + 1, right - left + 1) + textSizeVector[startIndex];
-	std::vector<size_t>::const_iterator it = std::lower_bound(textSizeVector.begin(), textSizeVector.end(), textSize);
-	size_t paragraphNumber = std::min((size_t)(it - textSizeVector.begin()), endIndex) - 1;
-	myTextView.gotoParagraph(paragraphNumber, true);
-	myTextView.preparePaintInfo();
-	const ZLTextWordCursor &endCursor = myTextView.endCursor();
-	if (!endCursor.isNull() && (paragraphNumber == endCursor.paragraphCursor().index())) {
-		if (!endCursor.paragraphCursor().isLast() || !endCursor.isEndOfParagraph()) {
-			size_t paragraphLength = endCursor.paragraphCursor().paragraphLength();
-			if (paragraphLength > 0) {
-				size_t wordNum =
-					muldiv(muldiv(fullTextSize, x - left - 1, right - left - 1) - sizeOfTextBeforeParagraph(paragraphNumber), paragraphLength, sizeOfParagraph(paragraphNumber));
-				myTextView.moveEndCursor(endCursor.paragraphCursor().index(), wordNum, 0);
-			}
-		}
-	}
 	return true;
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextSelectionModel.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextSelectionModel.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextSelectionModel.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextSelectionModel.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,35 @@
 #include "ZLTextSelectionModel.h"
 #include "ZLTextView.h"
 
-ZLTextSelectionModel::ZLTextSelectionModel(ZLTextView &view, ZLApplication &application) : myView(view), myApplication(application), myIsActive(false), myIsEmpty(true), myDoUpdate(false), myTextIsUpToDate(true) {
+ZLTextSelectionModel::ZLTextSelectionModel(ZLTextView &view, ZLApplication &application) : myView(view), myApplication(application), myIsActive(false), myIsEmpty(true), myDoUpdate(false), myTextIsUpToDate(true), myRangeVectorIsUpToDate(true) {
+}
+
+void ZLTextSelectionModel::clearData() const {
+	myText.erase();
+	myImage.reset();
+}
+
+int ZLTextSelectionModel::charIndex(const ZLTextElementArea &area, int x) {
+	myView.myStyle.setTextStyle(area.Style, area.BidiLevel);
+	ZLTextWordCursor cursor = myView.startCursor();
+	cursor.moveToParagraph(area.ParagraphIndex);
+	const ZLTextWord &word = (const ZLTextWord&)cursor.paragraphCursor()[area.ElementIndex];
+	const bool mainDir =
+		area.BidiLevel % 2 == myView.myStyle.baseBidiLevel() % 2;
+	const int deltaX = mainDir ? x - area.XStart : area.XEnd - x;
+	const int len = area.Length;
+	const int start = area.StartCharIndex;
+	int diff = deltaX;
+	int previousDiff = diff;
+	int index;
+	for (index = 0; (index < len) && (diff > 0); ++index) {
+		previousDiff = diff;
+		diff = deltaX - myView.myStyle.wordWidth(word, start, index + 1);
+	}
+	if (previousDiff + diff < 0) {
+		--index;
+	}
+	return start + index;
 }
 
 void ZLTextSelectionModel::setBound(Bound &bound, int x, int y) {
@@ -41,49 +69,38 @@
 	}
 
 	if (it != myView.myTextElementMap.end()) {
-		bound.After.ParagraphNumber = it->ParagraphNumber;
-		bound.After.TextElementNumber = it->TextElementNumber;
+		bound.After.ParagraphIndex = it->ParagraphIndex;
+		bound.After.ElementIndex = it->ElementIndex;
 		bound.After.Exists = true;
-		bound.After.CharNumber = it->StartCharNumber;
+		const bool mainDir =
+			it->BidiLevel % 2 == myView.myStyle.baseBidiLevel() % 2;
+		bound.After.CharIndex = mainDir ?
+			it->StartCharIndex :
+			it->StartCharIndex + it->Length;
 		if (ZLTextElementArea::RangeChecker(x, y)(*it)) {
-			bound.Before.ParagraphNumber = bound.After.ParagraphNumber;
-			bound.Before.TextElementNumber = bound.After.TextElementNumber;
+			bound.Before.ParagraphIndex = bound.After.ParagraphIndex;
+			bound.Before.ElementIndex = bound.After.ElementIndex;
 			bound.Before.Exists = true;
 			if (it->Kind == ZLTextElement::WORD_ELEMENT) {
-				myView.myStyle.setTextStyle(it->Style);
-				ZLTextWordCursor cursor = myView.startCursor();
-				cursor.moveToParagraph(it->ParagraphNumber);
-				const ZLTextWord &word = (const ZLTextWord&)cursor.paragraphCursor()[it->TextElementNumber];
-				const int deltaX = x - it->XStart;
-				const int len = it->Length;
-				const int start = it->StartCharNumber;
-				int diff = deltaX;
-				int previousDiff = diff;
-				int index;
-				for (index = 0; (index < len) && (diff > 0); ++index) {
-					previousDiff = diff;
-					diff = deltaX - myView.myStyle.wordWidth(word, start, index + 1);
-				}
-				if (previousDiff + diff < 0) {
-					--index;
-				}
-				bound.After.CharNumber = start + index;
-				bound.Before.CharNumber = bound.After.CharNumber;
+				bound.After.CharIndex = charIndex(*it, x);
+				bound.Before.CharIndex = bound.After.CharIndex;
 			}
 		} else if (it == myView.myTextElementMap.begin()) {
 			bound.Before.Exists = false;
 		} else {
 			const ZLTextElementArea &previous = *(it - 1);
-			bound.Before.ParagraphNumber = previous.ParagraphNumber;
-			bound.Before.TextElementNumber = previous.TextElementNumber;
-			bound.Before.CharNumber = previous.StartCharNumber + previous.Length;
+			bound.Before.ParagraphIndex = previous.ParagraphIndex;
+			bound.Before.ElementIndex = previous.ElementIndex;
+			bound.Before.CharIndex = (previous.BidiLevel % 2 == myView.myStyle.baseBidiLevel() % 2) ?
+				previous.StartCharIndex + previous.Length :
+				previous.StartCharIndex;
 			bound.Before.Exists = true;
 		}
 	} else {
 		const ZLTextElementArea &back = myView.myTextElementMap.back();
-		bound.Before.ParagraphNumber = back.ParagraphNumber;
-		bound.Before.TextElementNumber = back.TextElementNumber;
-		bound.Before.CharNumber = back.StartCharNumber + back.Length;
+		bound.Before.ParagraphIndex = back.ParagraphIndex;
+		bound.Before.ElementIndex = back.ElementIndex;
+		bound.Before.CharIndex = back.StartCharIndex + back.Length;
 		bound.Before.Exists = true;
 		bound.After.Exists = false;
 	}
@@ -99,16 +116,18 @@
 	setBound(myFirstBound, x, y);
 	mySecondBound = myFirstBound;
 	myCursors.clear();
-	myText.erase();
+	clearData();
 	myTextIsUpToDate = true;
+	myRanges.clear();
+	myRangeVectorIsUpToDate = true;
 }
 
 bool ZLTextSelectionModel::BoundElement::operator == (const ZLTextSelectionModel::BoundElement &element) const {
 	return
 		(Exists == element.Exists) &&
-		(ParagraphNumber == element.ParagraphNumber) &&
-		(TextElementNumber == element.TextElementNumber) &&
-		(CharNumber == element.CharNumber);
+		(ParagraphIndex == element.ParagraphIndex) &&
+		(ElementIndex == element.ElementIndex) &&
+		(CharIndex == element.CharIndex);
 }
 
 bool ZLTextSelectionModel::BoundElement::operator != (const ZLTextSelectionModel::BoundElement &element) const {
@@ -120,9 +139,9 @@
 		return false;
 	}
 
-	std::pair<BoundElement,BoundElement> oldRange = range();
+	Range oldRange = internalRange();
 	setBound(mySecondBound, x, y);
-	std::pair<BoundElement,BoundElement> newRange = range();
+	Range newRange = internalRange();
 	myStoredX = x;
 	myStoredY = y;
 
@@ -136,7 +155,9 @@
 
 	if ((oldRange.first != newRange.first) || (oldRange.second != newRange.second)) {
 		myTextIsUpToDate = false;
-		myText.erase();
+		clearData();
+		myRangeVectorIsUpToDate = false;
+		myRanges.clear();
 		return true;
 	}
 	return false;
@@ -154,15 +175,144 @@
 	myIsActive = false;
 	myDoUpdate = false;
 	myCursors.clear();
-	myText.erase();
+	clearData();
 	myTextIsUpToDate = true;
+	myRanges.clear();
+	myRangeVectorIsUpToDate = true;
+}
+
+const std::vector<ZLTextSelectionModel::Range> &ZLTextSelectionModel::ranges() const {
+	if (!myRangeVectorIsUpToDate && !isEmpty()) {
+		Range r = internalRange();
+
+		ZLTextWordCursor cursor = myView.startCursor();
+		cursor.moveToParagraph(r.first.ParagraphIndex);
+		cursor.moveToParagraphStart();
+		int startLevel = 0;
+		for (int i = r.first.ElementIndex; i > 0; --i) {
+			switch (cursor.element().kind()) {
+				case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+					++startLevel;
+					break;
+				case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
+					--startLevel;
+					break;
+				default:
+					break;
+			}
+			cursor.nextWord();
+		}
+
+		cursor.moveToParagraph(r.second.ParagraphIndex);
+		cursor.moveToParagraphEnd();
+		int endLevel = 0;
+		for (int i = cursor.elementIndex() - r.second.ElementIndex; i > 0; --i) {
+			cursor.previousWord();
+			switch (cursor.element().kind()) {
+				case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+					--endLevel;
+					break;
+				case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
+					++endLevel;
+					break;
+				default:
+					break;
+			}
+		}
+
+		if ((startLevel == 0) && (endLevel == 0)) {
+			myRanges.push_back(r);
+		} else if (r.first.ParagraphIndex == r.second.ParagraphIndex) {
+			BoundElement leftBound = r.first;
+			BoundElement rightBound;
+			rightBound.Exists = true;
+			rightBound.ParagraphIndex = leftBound.ParagraphIndex;
+			rightBound.CharIndex = 0;
+			cursor.moveTo(r.first.ElementIndex, 0);
+			for (int i = r.first.ElementIndex; i < r.second.ElementIndex; ++i) {
+				ZLTextElement::Kind kind = cursor.element().kind();
+				if ((kind == ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT) ||
+						(kind == ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT)) {
+					rightBound.ElementIndex = i;
+					myRanges.push_back(Range(leftBound, rightBound));
+					leftBound = rightBound;
+				}
+				cursor.nextWord();
+			}
+			myRanges.push_back(Range(leftBound, r.second));
+		} else {
+			BoundElement leftBound = r.first;
+			if (startLevel > 0) {
+				BoundElement rightBound;
+				rightBound.Exists = true;
+				rightBound.ParagraphIndex = leftBound.ParagraphIndex;
+				rightBound.ElementIndex = leftBound.ElementIndex;
+				rightBound.CharIndex = 0;
+				cursor.moveToParagraph(r.first.ParagraphIndex);
+				cursor.moveTo(r.first.ElementIndex, 0);
+				while (startLevel > 0) {
+					switch(cursor.element().kind()) {
+						case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+							++startLevel;
+							rightBound.ElementIndex = cursor.elementIndex();
+							myRanges.push_back(Range(leftBound, rightBound));
+							leftBound = rightBound;
+							break;
+						case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
+							--startLevel;
+							rightBound.ElementIndex = cursor.elementIndex();
+							myRanges.push_back(Range(leftBound, rightBound));
+							leftBound = rightBound;
+							break;
+						default:
+							break;
+					}
+					cursor.nextWord();
+				}
+			}
+
+			BoundElement rightBound1 = r.second;
+			if (endLevel > 0) {
+				BoundElement leftBound1;
+				leftBound1.Exists = true;
+				leftBound1.ParagraphIndex = rightBound1.ParagraphIndex;
+				leftBound1.ElementIndex = rightBound1.ElementIndex;
+				leftBound1.CharIndex = 0;
+				cursor.moveToParagraph(r.second.ParagraphIndex);
+				cursor.moveTo(r.second.ElementIndex, 0);
+				while (endLevel > 0) {
+					switch(cursor.element().kind()) {
+						case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+							--endLevel;
+							leftBound1.ElementIndex = cursor.elementIndex();
+							myRanges.push_back(Range(leftBound1, rightBound1));
+							rightBound1 = leftBound1;
+							break;
+						case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
+							++endLevel;
+							rightBound1.ElementIndex = cursor.elementIndex();
+							myRanges.push_back(Range(leftBound1, rightBound1));
+							rightBound1 = leftBound1;
+							break;
+						default:
+							break;
+					}
+					cursor.previousWord();
+				}
+			}
+			myRanges.push_back(Range(leftBound, rightBound1));
+		}
+
+		myRangeVectorIsUpToDate = true;
+	}
+	return myRanges;
 }
 
-std::pair<ZLTextSelectionModel::BoundElement,ZLTextSelectionModel::BoundElement> ZLTextSelectionModel::range() const {
+ZLTextSelectionModel::Range ZLTextSelectionModel::internalRange() const {
 	return
 		(mySecondBound < myFirstBound) ?
-		std::pair<BoundElement,BoundElement>(mySecondBound.After, myFirstBound.Before) :
-		std::pair<BoundElement,BoundElement>(myFirstBound.After, mySecondBound.Before);
+			Range(mySecondBound.After, myFirstBound.Before) :
+			Range(myFirstBound.After, mySecondBound.Before);
 }
 
 bool ZLTextSelectionModel::Bound::operator < (const Bound &bound) const {
@@ -180,28 +330,28 @@
 		return true;
 	}
 
-	if (Before.ParagraphNumber < bound.Before.ParagraphNumber) {
+	if (Before.ParagraphIndex < bound.Before.ParagraphIndex) {
 		return true;
 	}
-	if (Before.ParagraphNumber > bound.Before.ParagraphNumber) {
+	if (Before.ParagraphIndex > bound.Before.ParagraphIndex) {
 		return false;
 	}
 
-	if (Before.TextElementNumber < bound.Before.TextElementNumber) {
+	if (Before.ElementIndex < bound.Before.ElementIndex) {
 		return true;
 	}
-	if (Before.TextElementNumber > bound.Before.TextElementNumber) {
+	if (Before.ElementIndex > bound.Before.ElementIndex) {
 		return false;
 	}
 
-	return Before.CharNumber < bound.Before.CharNumber;
+	return Before.CharIndex < bound.Before.CharIndex;
 }
 
 bool ZLTextSelectionModel::isEmpty() const {
 	if (myIsEmpty) {
 		return true;
 	}
-	std::pair<BoundElement,BoundElement> r = range();
+	Range r = internalRange();
 	return !r.first.Exists || !r.second.Exists || (r.first == r.second);
 }
 
@@ -238,7 +388,9 @@
 		setBound(mySecondBound, myStoredX, myStoredY);
 		myView.copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION);
 		myTextIsUpToDate = false;
-		myText.erase();
+		clearData();
+		myRangeVectorIsUpToDate = false;
+		myRanges.clear();
 	}
 }
 
@@ -252,23 +404,24 @@
 	}
 }
 
-const std::string &ZLTextSelectionModel::getText() const {
+void ZLTextSelectionModel::createData() const {
 	if (!myTextIsUpToDate && !isEmpty()) {
-		std::pair<BoundElement,BoundElement> r = range();
+		Range r = internalRange();
 
 		ZLTextWordCursor start = myView.startCursor();
-		start.moveToParagraph(r.first.ParagraphNumber);
-		start.moveTo(r.first.TextElementNumber, r.first.CharNumber);
+		start.moveToParagraph(r.first.ParagraphIndex);
+		start.moveTo(r.first.ElementIndex, r.first.CharIndex);
 
 		ZLTextWordCursor end = myView.startCursor();
-		end.moveToParagraph(r.second.ParagraphNumber);
-		end.moveTo(r.second.TextElementNumber, r.second.CharNumber);
+		end.moveToParagraph(r.second.ParagraphIndex);
+		end.moveTo(r.second.ElementIndex, r.second.CharIndex);
 
 		std::set<ZLTextParagraphCursorPtr> pcursors;
 		pcursors.insert(start.paragraphCursorPtr());
 
-		for (ZLTextWordCursor cursor = start; cursor < end; ) {
-			if ((cursor < end) && cursor.isEndOfParagraph()) {
+		ZLTextWordCursor cursor = start;
+		while (cursor < end) {
+			if (cursor.isEndOfParagraph()) {
 				cursor.nextParagraph();
 				pcursors.insert(cursor.paragraphCursorPtr());
 				myText.append(ZLibrary::EndOfLine);
@@ -281,39 +434,149 @@
 					const ZLTextWord &word = (const ZLTextWord&)element;
 					if (cursor.sameElementAs(end)) {
 						if (start.sameElementAs(end)) {
-							int skip = ZLUnicodeUtil::length(word.Data, start.charNumber());
-							int length = ZLUnicodeUtil::length(word.Data, end.charNumber()) - skip;
+							int skip = ZLUnicodeUtil::length(word.Data, start.charIndex());
+							int length = ZLUnicodeUtil::length(word.Data, end.charIndex()) - skip;
 							myText.append(word.Data + skip, length);
 						} else {
-							myText.append(word.Data, ZLUnicodeUtil::length(word.Data, end.charNumber()));
+							myText.append(word.Data, ZLUnicodeUtil::length(word.Data, end.charIndex()));
 						}
-					} else if (cursor.charNumber() == 0) {
+					} else if (cursor.charIndex() == 0) {
 						myText.append(word.Data, word.Size);
 					} else /* cursor == start */ {
-						int skip = ZLUnicodeUtil::length(word.Data, cursor.charNumber());
+						int skip = ZLUnicodeUtil::length(word.Data, cursor.charIndex());
 						myText.append(word.Data + skip, word.Size - skip);
 					}
 					break;
 				}
-				case ZLTextElement::HSPACE_ELEMENT:
-					myText += ' ';
+				case ZLTextElement::IMAGE_ELEMENT:
+					if (myImage.isNull()) {
+						myImage = ((const ZLTextImageElement&)element).image();
+					}
 					break;
+				case ZLTextElement::HSPACE_ELEMENT:
 				case ZLTextElement::NB_HSPACE_ELEMENT:
-					myText += "\xC2\x20"; // &nbsp;
+					myText += ' ';
 					break;
 				default:
 					break;
 			}
 			cursor.nextWord();
 		}
+		if ((cursor == end) && !cursor.isEndOfParagraph() && myImage.isNull()) {
+			const ZLTextElement &element = cursor.element();
+			if (element.kind() == ZLTextElement::IMAGE_ELEMENT) {
+				myImage = ((const ZLTextImageElement&)element).image();
+			}
+		}
 
 		myCursors.swap(pcursors);
 		myTextIsUpToDate = true;
 	}
+}
 
+const std::string &ZLTextSelectionModel::text() const {
+	createData();
 	return myText;
 }
 
+shared_ptr<ZLImageData> ZLTextSelectionModel::image() const {
+	createData();
+	return myImage;
+}
+
+bool ZLTextSelectionModel::selectWord(int x, int y) {
+	clear();
+
+	ZLTextElementMap::const_iterator it = myView.myTextElementMap.begin();
+	for (; it != myView.myTextElementMap.end(); ++it) {
+		if ((it->YStart > y) || ((it->YEnd > y) && (it->XEnd > x))) {
+			break;
+		}
+	}
+	if (it == myView.myTextElementMap.end()) {
+		return false;
+	}
+	if (ZLTextElementArea::RangeChecker(x, y)(*it)) {
+		int startIndex = 0;
+		int endIndex = 1;
+		switch (it->Kind) {
+			default:
+				return false;
+			case ZLTextElement::IMAGE_ELEMENT:
+				break;
+			case ZLTextElement::WORD_ELEMENT:
+			{
+				ZLTextWordCursor cursor = myView.startCursor();
+				cursor.moveToParagraph(it->ParagraphIndex);
+				const ZLTextWord &word = (const ZLTextWord&)cursor.paragraphCursor()[it->ElementIndex];
+				ZLUnicodeUtil::Ucs4String ucs4string;
+				ZLUnicodeUtil::utf8ToUcs4(ucs4string, word.Data, word.Size);
+				startIndex = charIndex(*it, x);
+				if (startIndex == word.Length) {
+					--startIndex;
+				}
+				endIndex = startIndex + 1;
+				ZLUnicodeUtil::Ucs4Char ch = ucs4string[startIndex];
+				if (ZLUnicodeUtil::isLetter(ch) || (('0' <= ch) && (ch <= '9'))) {
+					while (--startIndex >= 0) {
+						ch = ucs4string[startIndex];
+						if (!ZLUnicodeUtil::isLetter(ch) && ((ch < '0') || (ch > '9'))) {
+							break;
+						}
+					}
+					++startIndex;
+					while (++endIndex <= word.Length) {
+						ch = ucs4string[endIndex - 1];
+						if (!ZLUnicodeUtil::isLetter(ch) && ((ch < '0') || (ch > '9'))) {
+							break;
+						}
+					}
+					--endIndex;
+				}
+			}
+		}
+
+		myFirstBound.Before.Exists = true;
+		myFirstBound.Before.ParagraphIndex = it->ParagraphIndex;
+		myFirstBound.Before.ElementIndex = it->ElementIndex;
+		myFirstBound.Before.CharIndex = startIndex;
+		myFirstBound.After = myFirstBound.Before;
+
+		mySecondBound.Before = myFirstBound.Before;
+		mySecondBound.Before.CharIndex = endIndex;
+		mySecondBound.After = mySecondBound.Before;
+
+		myIsEmpty = false;
+		myTextIsUpToDate = false;
+		myRangeVectorIsUpToDate = false;
+		myDoUpdate = false;
+
+		return true;
+	}
+	return false;
+}
+
+void ZLTextSelectionModel::extendWordSelectionToParagraph() {
+	clear();
+
+	myFirstBound.Before.ElementIndex = 0;
+	myFirstBound.Before.CharIndex = 0;
+	myFirstBound.After = myFirstBound.Before;
+
+	ZLTextWordCursor cursor = myView.startCursor();
+	cursor.moveToParagraph(myFirstBound.Before.ParagraphIndex);
+	cursor.moveToParagraphEnd();
+
+	mySecondBound.Before.ElementIndex = cursor.elementIndex();
+	mySecondBound.Before.CharIndex = 0;
+	mySecondBound.After = mySecondBound.Before;
+
+	myIsEmpty = false;
+	myTextIsUpToDate = false;
+	myRangeVectorIsUpToDate = false;
+	myDoUpdate = false;
+}
+
 ZLTextSelectionScroller::ZLTextSelectionScroller(ZLTextSelectionModel &selectionModel) : mySelectionModel(selectionModel), myDirection(DONT_SCROLL) {
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextSelectionModel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextSelectionModel.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextSelectionModel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextSelectionModel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,10 +31,24 @@
 
 class ZLTextView;
 class ZLApplication;
+class ZLImageData;
+class ZLTextElementArea;
 
 class ZLTextSelectionModel {
 
 public:
+	struct BoundElement {
+		bool Exists;
+		int ParagraphIndex;
+		int ElementIndex;
+		size_t CharIndex;
+
+		bool operator == (const BoundElement &element) const;
+		bool operator != (const BoundElement &element) const;
+	};
+	typedef std::pair<BoundElement,BoundElement> Range;
+
+public:
 	ZLTextSelectionModel(ZLTextView &view, ZLApplication &application);
 
 	void activate(int x, int y);
@@ -43,19 +57,14 @@
 	void deactivate();
 	void clear();
 
-	const std::string &getText() const;
-	bool isEmpty() const;
+	bool selectWord(int x, int y);
+	void extendWordSelectionToParagraph();
 
-public:
-	struct BoundElement {
-		bool Exists;
-		int ParagraphNumber;
-		int TextElementNumber;
-		size_t CharNumber;
+	const std::string &text() const;
+	shared_ptr<ZLImageData> image() const;
+	const std::vector<Range> &ranges() const;
 
-		bool operator == (const BoundElement &element) const;
-		bool operator != (const BoundElement &element) const;
-	};
+	bool isEmpty() const;
 
 private:
 	struct Bound {
@@ -65,16 +74,19 @@
 		bool operator < (const Bound &bound) const;
 	};
 
-public:
-	std::pair<BoundElement,BoundElement> range() const;
-
 private:
+	int charIndex(const ZLTextElementArea &area, int x);
+
+	Range internalRange() const;
 	void setBound(Bound &bound, int x, int y);
 	void startSelectionScrolling(bool forward);
 	void stopSelectionScrolling();
 
 	void scrollAndExtend();
 
+	void clearData() const;
+	void createData() const;
+
 private:
 	ZLTextView &myView;
 	ZLApplication &myApplication;
@@ -91,8 +103,12 @@
 
 	mutable std::set<ZLTextParagraphCursorPtr> myCursors;
 	mutable std::string myText;
+	mutable shared_ptr<ZLImageData> myImage;
 	mutable bool myTextIsUpToDate;
 
+	mutable std::vector<Range> myRanges;
+	mutable bool myRangeVectorIsUpToDate;
+
 friend class ZLTextSelectionScroller;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyleCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyleCollection.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyleCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyleCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -92,18 +92,6 @@
 			ZLBoolean3 italic = b3Value(attributes, "italic");
 			int verticalShift = intValue(attributes, "vShift");
 			ZLBoolean3 allowHyphenations = b3Value(attributes, "allowHyphenations");
-			ZLTextStyleDecoration::HyperlinkStyle hyperlinkStyle = ZLTextStyleDecoration::NONE;
-			const char *hyperlink = attributeValue(attributes, "hyperlink");
-			if (hyperlink != 0) {
-				static const std::string INTERNAL_STRING = "internal";
-				if (INTERNAL_STRING == hyperlink) {
-					hyperlinkStyle = ZLTextStyleDecoration::INTERNAL;
-				}
-				static const std::string EXTERNAL_STRING = "external";
-				if (EXTERNAL_STRING == hyperlink) {
-					hyperlinkStyle = ZLTextStyleDecoration::EXTERNAL;
-				}
-			}
 
 			if (booleanValue(attributes, "partial")) {
 				decoration = new ZLTextStyleDecoration(name, fontSizeDelta, bold, italic, verticalShift, allowHyphenations);
@@ -132,7 +120,10 @@
 
 				decoration = new ZLTextFullStyleDecoration(name, fontSizeDelta, bold, italic, spaceBefore, spaceAfter, leftIndent, rightIndent, firstLineIndentDelta, verticalShift, alignment, lineSpace, allowHyphenations);
 			}
-			decoration->setHyperlinkStyle(hyperlinkStyle);
+			const char *hyperlink = attributeValue(attributes, "hyperlink");
+			if (hyperlink != 0) {
+				decoration->setHyperlinkStyle(hyperlink);
+			}
 
 			const char *fontFamily = attributeValue(attributes, "family");
 			if (fontFamily != 0) {
@@ -145,6 +136,7 @@
 }
 
 ZLTextStyleCollection::ZLTextStyleCollection() :
+	OverrideSpecifiedFontsOption(ZLCategoryKey::LOOK_AND_FEEL, "Style", "UseCustomFonts", false),
 	myBaseStyle(0) {
 	ZLTextStyleReader(*this).readDocument(ZLibrary::DefaultFilesPathPrefix() + "styles.xml");
 	if (myBaseStyle.isNull()) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyle.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyle.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyle.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyle.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 
 #include <ZLTextKind.h>
 #include <ZLTextAlignmentType.h>
+#include <ZLTextParagraph.h>
 
 class ZLTextStyle {
 
@@ -48,11 +49,11 @@
 
 	virtual ZLColor color() const = 0;
 
-	virtual int spaceBefore() const = 0;
-	virtual int spaceAfter() const = 0;
-	virtual int leftIndent() const = 0;
-	virtual int rightIndent() const = 0;
-	virtual int firstLineIndentDelta() const = 0;
+	virtual short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const = 0;
+	virtual short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const = 0;
+	virtual short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const = 0;
+	virtual short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const = 0;
+	virtual short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const = 0;
 	virtual int verticalShift() const = 0;
 	virtual ZLTextAlignmentType alignment() const = 0;
 	virtual double lineSpace() const = 0;
@@ -79,11 +80,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 
 	ZLTextAlignmentType alignment() const;
@@ -97,10 +98,11 @@
 	ZLColorOption SelectionBackgroundColorOption;
 	ZLColorOption SelectedTextColorOption;
 	ZLColorOption RegularTextColorOption;
-	ZLColorOption InternalHyperlinkTextColorOption;
-	ZLColorOption ExternalHyperlinkTextColorOption;
 	ZLColorOption TreeLinesColorOption;
 
+	bool hasHyperlinkColorOption(const std::string &type);
+	ZLColorOption &hyperlinkColorOption(const std::string &type);
+
 	ZLBooleanOption AutoHyphenationOption;
 
 	ZLStringOption FontFamilyOption;
@@ -110,6 +112,9 @@
 	ZLIntegerOption AlignmentOption;
 	ZLDoubleOption LineSpaceOption;
 	ZLIntegerOption LineSpacePercentOption;
+
+private:
+	std::map<std::string,shared_ptr<ZLColorOption> > myHyperlinkColorOptions;
 };
 
 class ZLTextStyleDecoration {
@@ -124,13 +129,8 @@
 
 	const std::string &name() const;
 
-	enum HyperlinkStyle {
-		NONE,
-		INTERNAL,
-		EXTERNAL
-	};
-	HyperlinkStyle hyperlinkStyle() const;
-	void setHyperlinkStyle(HyperlinkStyle hyperlinkStyle);
+	const std::string &hyperlinkStyle() const;
+	void setHyperlinkStyle(const std::string &hyperlinkStyle);
 
 public:
 	ZLStringOption FontFamilyOption;
@@ -145,13 +145,13 @@
 private:
 	std::string myName;
 
-	HyperlinkStyle myHyperlinkStyle;
+	std::string myHyperlinkStyle;
 };
 
 class ZLTextFullStyleDecoration : public ZLTextStyleDecoration {
 
 public:
-	ZLTextFullStyleDecoration(const std::string &name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, int spaceBefore, int spaceAfter, int leftIndent, int rightIndent, int firstLineIndentDelta, int verticalShift, ZLTextAlignmentType alignment, double lineSpace, ZLBoolean3 allowHyphenations);
+	ZLTextFullStyleDecoration(const std::string &name, int fontSizeDelta, ZLBoolean3 bold, ZLBoolean3 italic, short spaceBefore, short spaceAfter, short lineStartIndent, short lineEndIndent, short firstLineIndentDelta, int verticalShift, ZLTextAlignmentType alignment, double lineSpace, ZLBoolean3 allowHyphenations);
 	~ZLTextFullStyleDecoration();
 
 	virtual bool isFullDecoration() const;
@@ -161,8 +161,8 @@
 public:
 	ZLIntegerRangeOption SpaceBeforeOption;
 	ZLIntegerRangeOption SpaceAfterOption;
-	ZLIntegerRangeOption LeftIndentOption;
-	ZLIntegerRangeOption RightIndentOption;
+	ZLIntegerRangeOption LineStartIndentOption;
+	ZLIntegerRangeOption LineEndIndentOption;
 	ZLIntegerRangeOption FirstLineIndentDeltaOption;
 
 	ZLIntegerOption AlignmentOption;
@@ -186,12 +186,12 @@
 	const ZLTextStylePtr myBase;
 };
 
-class ZLTextForcedControlEntry;
+class ZLTextStyleEntry;
 
 class ZLTextForcedStyle : public ZLTextDecoratedStyle {
 
 public:
-	ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextForcedControlEntry &entry);
+	ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextStyleEntry &entry);
 	~ZLTextForcedStyle();
 
 	const std::string &fontFamily() const;
@@ -202,11 +202,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 	ZLTextAlignmentType alignment() const;
 	double lineSpace() const;
@@ -214,7 +214,7 @@
 	bool allowHyphenations() const;
 
 private:
-	const ZLTextForcedControlEntry &myEntry;
+	const ZLTextStyleEntry &myEntry;
 };
 
 class ZLTextPartialDecoratedStyle : public ZLTextDecoratedStyle {
@@ -232,11 +232,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 
 	ZLTextAlignmentType alignment() const;
@@ -263,11 +263,11 @@
 
 	ZLColor color() const;
 
-	int spaceBefore() const;
-	int spaceAfter() const;
-	int leftIndent() const;
-	int rightIndent() const;
-	int firstLineIndentDelta() const;
+	short spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const;
+	short spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const;
+	short lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const;
+	short firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const;
 	int verticalShift() const;
 
 	ZLTextAlignmentType alignment() const;
@@ -287,7 +287,13 @@
 public:
 	virtual ~ZLTextPositionIndicatorInfo();
 
-	virtual bool isVisible() const = 0;
+	enum Type {
+		OS_SCROLLBAR = 0,
+		FB_INDICATOR = 1,
+		NONE = 2
+	};
+
+	virtual Type type() const = 0;
 	virtual bool isSensitive() const = 0;
 	virtual bool isTextPositionShown() const = 0;
 	virtual bool isTimeShown() const = 0;
@@ -311,6 +317,8 @@
 	ZLTextBaseStyle &baseStyle() const;
 	ZLTextStyleDecoration *decoration(ZLTextKind kind) const;
 
+	ZLBooleanOption OverrideSpecifiedFontsOption;
+
 private:
 	ZLTextStyleCollection();
 	~ZLTextStyleCollection();
@@ -327,6 +335,7 @@
 
 inline ZLTextStyle::ZLTextStyle() {}
 inline ZLTextStyle::~ZLTextStyle() {}
+
 inline int ZLTextStyle::lineSpacePercent() const { return (int)(lineSpace() * 100); }
 
 inline bool ZLTextBaseStyle::isDecorated() const { return false; }
@@ -334,11 +343,11 @@
 inline int ZLTextBaseStyle::fontSize() const { return FontSizeOption.value(); }
 inline bool ZLTextBaseStyle::bold() const { return BoldOption.value(); }
 inline bool ZLTextBaseStyle::italic() const { return ItalicOption.value(); }
-inline int ZLTextBaseStyle::spaceBefore() const { return 0; }
-inline int ZLTextBaseStyle::spaceAfter() const { return 0; }
-inline int ZLTextBaseStyle::leftIndent() const { return 0; }
-inline int ZLTextBaseStyle::rightIndent() const { return 0; }
-inline int ZLTextBaseStyle::firstLineIndentDelta() const { return 0; }
+inline short ZLTextBaseStyle::spaceBefore(const ZLTextStyleEntry::Metrics&) const { return 0; }
+inline short ZLTextBaseStyle::spaceAfter(const ZLTextStyleEntry::Metrics&) const { return 0; }
+inline short ZLTextBaseStyle::lineStartIndent(const ZLTextStyleEntry::Metrics&, bool) const { return 0; }
+inline short ZLTextBaseStyle::lineEndIndent(const ZLTextStyleEntry::Metrics&, bool) const { return 0; }
+inline short ZLTextBaseStyle::firstLineIndentDelta(const ZLTextStyleEntry::Metrics&) const { return 0; }
 inline int ZLTextBaseStyle::verticalShift() const { return 0; }
 inline ZLTextAlignmentType ZLTextBaseStyle::alignment() const { return (ZLTextAlignmentType)AlignmentOption.value(); }
 inline double ZLTextBaseStyle::lineSpace() const { return LineSpacePercentOption.value() / 100.0; }
@@ -347,8 +356,6 @@
 inline ZLTextStyleDecoration::~ZLTextStyleDecoration() {}
 inline bool ZLTextStyleDecoration::isFullDecoration() const { return false; }
 inline const std::string &ZLTextStyleDecoration::name() const { return myName; }
-inline ZLTextStyleDecoration::HyperlinkStyle ZLTextStyleDecoration::hyperlinkStyle() const { return myHyperlinkStyle; }
-inline void ZLTextStyleDecoration::setHyperlinkStyle(HyperlinkStyle hyperlinkStyle) { myHyperlinkStyle = hyperlinkStyle; }
 
 inline ZLTextFullStyleDecoration::~ZLTextFullStyleDecoration() {}
 inline bool ZLTextFullStyleDecoration::isFullDecoration() const { return true; }
@@ -358,37 +365,30 @@
 inline bool ZLTextDecoratedStyle::isDecorated() const { return true; }
 inline const ZLTextStylePtr ZLTextDecoratedStyle::base() const { return myBase; }
 
-inline ZLTextForcedStyle::ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextForcedControlEntry &entry) : ZLTextDecoratedStyle(base), myEntry(entry) {}
+inline ZLTextForcedStyle::ZLTextForcedStyle(ZLTextStylePtr base, const ZLTextStyleEntry &entry) : ZLTextDecoratedStyle(base), myEntry(entry) {}
 inline ZLTextForcedStyle::~ZLTextForcedStyle() {}
-inline const std::string &ZLTextForcedStyle::fontFamily() const { return base()->fontFamily(); }
-inline int ZLTextForcedStyle::fontSize() const { return base()->fontSize(); }
-inline bool ZLTextForcedStyle::bold() const { return base()->bold(); }
-inline bool ZLTextForcedStyle::italic() const { return base()->italic(); }
 inline ZLColor ZLTextForcedStyle::color() const { return base()->color(); }
-inline int ZLTextForcedStyle::spaceBefore() const { return base()->spaceBefore(); }
-inline int ZLTextForcedStyle::spaceAfter() const { return base()->spaceAfter(); }
-inline int ZLTextForcedStyle::firstLineIndentDelta() const { return base()->firstLineIndentDelta(); }
 inline int ZLTextForcedStyle::verticalShift() const { return base()->verticalShift(); }
 inline double ZLTextForcedStyle::lineSpace() const { return base()->lineSpace(); }
 inline bool ZLTextForcedStyle::allowHyphenations() const { return base()->allowHyphenations(); }
 
 inline ZLTextPartialDecoratedStyle::ZLTextPartialDecoratedStyle(const ZLTextStylePtr base, const ZLTextStyleDecoration &decoration) : ZLTextDecoratedStyle(base), myDecoration(decoration) {}
 inline ZLTextPartialDecoratedStyle::~ZLTextPartialDecoratedStyle() {}
-inline int ZLTextPartialDecoratedStyle::spaceBefore() const { return base()->spaceBefore(); }
-inline int ZLTextPartialDecoratedStyle::spaceAfter() const { return base()->spaceAfter(); }
-inline int ZLTextPartialDecoratedStyle::leftIndent() const { return base()->leftIndent(); }
-inline int ZLTextPartialDecoratedStyle::rightIndent() const { return base()->rightIndent(); }
-inline int ZLTextPartialDecoratedStyle::firstLineIndentDelta() const { return base()->firstLineIndentDelta(); }
+inline short ZLTextPartialDecoratedStyle::spaceBefore(const ZLTextStyleEntry::Metrics &metrics) const { return base()->spaceBefore(metrics); }
+inline short ZLTextPartialDecoratedStyle::spaceAfter(const ZLTextStyleEntry::Metrics &metrics) const { return base()->spaceAfter(metrics); }
+inline short ZLTextPartialDecoratedStyle::lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineStartIndent(metrics, rtl); }
+inline short ZLTextPartialDecoratedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineEndIndent(metrics, rtl); }
+inline short ZLTextPartialDecoratedStyle::firstLineIndentDelta(const ZLTextStyleEntry::Metrics &metrics) const { return base()->firstLineIndentDelta(metrics); }
 inline int ZLTextPartialDecoratedStyle::verticalShift() const { return base()->verticalShift() + myDecoration.VerticalShiftOption.value(); }
 inline ZLTextAlignmentType ZLTextPartialDecoratedStyle::alignment() const { return base()->alignment(); }
 inline double ZLTextPartialDecoratedStyle::lineSpace() const { return base()->lineSpace(); }
 
 inline ZLTextFullDecoratedStyle::ZLTextFullDecoratedStyle(const ZLTextStylePtr base, const ZLTextFullStyleDecoration &decoration) : ZLTextDecoratedStyle(base), myDecoration(decoration) {}
 inline ZLTextFullDecoratedStyle::~ZLTextFullDecoratedStyle() {}
-inline int ZLTextFullDecoratedStyle::spaceBefore() const { return myDecoration.SpaceBeforeOption.value(); }
-inline int ZLTextFullDecoratedStyle::spaceAfter() const { return myDecoration.SpaceAfterOption.value(); }
-inline int ZLTextFullDecoratedStyle::leftIndent() const { return base()->leftIndent() + myDecoration.LeftIndentOption.value(); }
-inline int ZLTextFullDecoratedStyle::rightIndent() const { return base()->rightIndent() + myDecoration.RightIndentOption.value(); }
+inline short ZLTextFullDecoratedStyle::spaceBefore(const ZLTextStyleEntry::Metrics&) const { return myDecoration.SpaceBeforeOption.value(); }
+inline short ZLTextFullDecoratedStyle::spaceAfter(const ZLTextStyleEntry::Metrics&) const { return myDecoration.SpaceAfterOption.value(); }
+inline short ZLTextFullDecoratedStyle::lineStartIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineStartIndent(metrics, rtl) + myDecoration.LineStartIndentOption.value(); }
+inline short ZLTextFullDecoratedStyle::lineEndIndent(const ZLTextStyleEntry::Metrics &metrics, bool rtl) const { return base()->lineEndIndent(metrics, rtl) + myDecoration.LineEndIndentOption.value(); }
 inline int ZLTextFullDecoratedStyle::verticalShift() const { return base()->verticalShift() + myDecoration.VerticalShiftOption.value(); }
 inline double ZLTextFullDecoratedStyle::lineSpace() const {
 	const int spacing = myDecoration.LineSpacePercentOption.value();
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyleOptions.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyleOptions.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyleOptions.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyleOptions.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyleOptions.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyleOptions.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextStyleOptions.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextStyleOptions.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextView.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,9 @@
 
 #include <algorithm>
 
+#include <ZLibrary.h>
 #include <ZLUnicodeUtil.h>
+#include <ZLLanguageUtil.h>
 #include <ZLApplication.h>
 
 #include <ZLTextModel.h>
@@ -31,7 +33,7 @@
 #include "ZLTextWord.h"
 #include "ZLTextSelectionModel.h"
 
-ZLTextView::ZLTextView(ZLApplication &application, shared_ptr<ZLPaintContext> context) : ZLView(application, context), myPaintState(NOTHING_TO_PAINT), myOldWidth(-1), myOldHeight(-1), myStyle(context), mySelectionModel(*this, application), myTreeStateIsFrozen(false) {
+ZLTextView::ZLTextView(ZLApplication &application, shared_ptr<ZLPaintContext> context) : ZLView(application, context), myPaintState(NOTHING_TO_PAINT), myOldWidth(-1), myOldHeight(-1), myStyle(context), mySelectionModel(*this, application), myTreeStateIsFrozen(false), myDoUpdateScrollbar(false) {
 }
 
 ZLTextView::~ZLTextView() {
@@ -59,22 +61,35 @@
 	ZLTextParagraphCursorCache::clear();
 }
 
-void ZLTextView::setModel(shared_ptr<ZLTextModel> model) {
+void ZLTextView::setModel(shared_ptr<ZLTextModel> model, const std::string &language) {
 	clear();
 
 	myModel = model;
+	myLanguage = language.empty() ? ZLibrary::Language() : language;
+	myStyle.setBaseBidiLevel(ZLLanguageUtil::isRTLLanguage(myLanguage) ? 1 : 0);
 
 	if (!myModel.isNull() && (myModel->paragraphsNumber() != 0)) {
-		setStartCursor(ZLTextParagraphCursor::cursor(*myModel));
+		setStartCursor(ZLTextParagraphCursor::cursor(*myModel, myLanguage));
 
 		size_t size = myModel->paragraphsNumber();
 		myTextSize.reserve(size + 1);
 		myTextSize.push_back(0);
+		size_t currentSize = 0;
 		for (size_t i= 0; i < size; ++i) {
-			myTextSize.push_back(myTextSize.back() + (*myModel)[i]->textLength());
-			if ((*myModel)[i]->kind() == ZLTextParagraph::END_OF_TEXT_PARAGRAPH) {
-				myTextBreaks.push_back(i);
+			const ZLTextParagraph &para = *(*myModel)[i];
+			currentSize += para.characterNumber();
+			switch (para.kind()) {
+				case ZLTextParagraph::END_OF_TEXT_PARAGRAPH:
+					myTextBreaks.push_back(i);
+					currentSize = ((currentSize - 1) / 2048 + 1) * 2048;
+					break;
+				case ZLTextParagraph::END_OF_SECTION_PARAGRAPH:
+					currentSize = ((currentSize - 1) / 2048 + 1) * 2048;
+					break;
+				default:
+					break;
 			}
+			myTextSize.push_back(currentSize);
 		}
 	}
 }
@@ -136,28 +151,59 @@
 	application().refreshWindow();
 }
 
-int ZLTextView::paragraphIndexByCoordinate(int y) const {
-	int indexBefore = -1;
+int ZLTextView::paragraphIndexByCoordinates(int x, int y) const {
+	x = visualX(x);
+	int paragraphIndex = -1;
+	int yBottom = -1;
+	int xLeft = context().width() + 1;
+	int xRight = -1;
+
 	for (ZLTextElementIterator it = myTextElementMap.begin(); it != myTextElementMap.end(); ++it) {
 		if (it->YEnd < y) {
-			indexBefore = it->ParagraphNumber;
-		} else if ((it->YStart <= y) || (it->ParagraphNumber == indexBefore)) {
-			return it->ParagraphNumber;
-		} else {
-			return -1;
+			paragraphIndex = it->ParagraphIndex;
+			if (it->YStart > yBottom) {
+				yBottom = it->YEnd;
+				xLeft = it->XStart;
+				xRight = -1;
+			}
+			xRight = it->XEnd;
+			continue;
 		}
+		if (it->YStart > y) {
+			return
+				((paragraphIndex == it->ParagraphIndex) &&
+				 (xLeft <= x) && (x <= xRight)) ?
+				paragraphIndex : -1;
+		}
+		if (it->XEnd < x) {
+			paragraphIndex = it->ParagraphIndex;
+			if (it->YStart > yBottom) {
+				yBottom = it->YEnd;
+				xLeft = it->XStart;
+				xRight = -1;
+			}
+			xRight = it->XEnd;
+			continue;
+		}
+		if (it->XStart > x) {
+			return
+				((paragraphIndex == it->ParagraphIndex) &&
+				 (it->YStart <= yBottom) && (xLeft < x)) ?
+				paragraphIndex : -1;
+		}
+		return it->ParagraphIndex;
 	}
 	return -1;
 }
 
 const ZLTextElementArea *ZLTextView::elementByCoordinates(int x, int y) const {
 	ZLTextElementIterator it =
-		std::find_if(myTextElementMap.begin(), myTextElementMap.end(), ZLTextElementArea::RangeChecker(x, y));
+		std::find_if(myTextElementMap.begin(), myTextElementMap.end(), ZLTextElementArea::RangeChecker(visualX(x), y));
 	return (it != myTextElementMap.end()) ? &*it : 0;
 }
 
 void ZLTextView::gotoMark(ZLTextMark mark) {
-	if (mark.ParagraphNumber < 0) {
+	if (mark.ParagraphIndex < 0) {
 		return;
 	}
 	bool doRepaint = false;
@@ -168,10 +214,10 @@
 	if (startCursor().isNull()) {
 		return;
 	}
-	if (((int)startCursor().paragraphCursor().index() != mark.ParagraphNumber) ||
+	if (((int)startCursor().paragraphCursor().index() != mark.ParagraphIndex) ||
 			(startCursor().position() > mark)) {
 		doRepaint = true;
-		gotoParagraph(mark.ParagraphNumber);
+		gotoParagraph(mark.ParagraphIndex);
 		preparePaintInfo();
 	}
 	if (endCursor().isNull()) {
@@ -187,22 +233,38 @@
 	}
 }
 
-void ZLTextView::gotoParagraph(int num, bool last) {
+void ZLTextView::gotoParagraph(int num, bool end) {
 	if (myModel.isNull()) {
 		return;
 	}
 
+	if (!startCursor().isNull() &&
+			startCursor().isStartOfParagraph() &&
+			startCursor().paragraphCursor().isFirst() &&
+			(num >= (int)startCursor().paragraphCursor().index()) &&
+			!endCursor().isNull() &&
+			endCursor().isEndOfParagraph() &&
+			endCursor().paragraphCursor().isLast() &&
+			(num <= (int)endCursor().paragraphCursor().index())) {
+		return;
+	}
+
 	if (myModel->kind() == ZLTextModel::TREE_MODEL) {
 		if ((num >= 0) && (num < (int)myModel->paragraphsNumber())) {
 			ZLTextTreeParagraph *tp = (ZLTextTreeParagraph*)(*myModel)[num];
 			if (myTreeStateIsFrozen) {
 				int corrected = num;
-				ZLTextTreeParagraph *parent = tp->parent();
-				while ((corrected > 0) && (parent != 0) && !parent->isOpen()) {
-					for (--corrected; ((corrected > 0) && parent != (*myModel)[corrected]); --corrected);
-					parent = parent->parent();
+				ZLTextTreeParagraph *visible = tp;
+				for (ZLTextTreeParagraph *parent = tp->parent(); parent != 0; parent = parent->parent()) {
+					if (!parent->isOpen()) {
+						visible = parent;
+					}
 				}
-				if (last && (corrected != num)) {
+				if (visible != tp) {
+					for (--corrected; ((corrected > 0) && visible != (*myModel)[corrected]); --corrected) {
+					}
+				}
+				if (end && (corrected != num)) {
 					++corrected;
 				}
 				num = corrected;
@@ -213,7 +275,7 @@
 		}
 	}
 
-	if (last) {
+	if (end) {
 		if ((num > 0) && (num <= (int)myModel->paragraphsNumber())) {
 			moveEndCursor(num);
 		}
@@ -224,11 +286,11 @@
 	}
 }
 
-void ZLTextView::gotoPosition(int paragraphNumber, int wordNumber, int charNumber) {
-	gotoParagraph(paragraphNumber, false);
+void ZLTextView::gotoPosition(int paragraphIndex, int elementIndex, int charIndex) {
+	gotoParagraph(paragraphIndex, false);
 	if (!myStartCursor.isNull() && 
-			((int)myStartCursor.paragraphCursor().index() == paragraphNumber)) {
-		moveStartCursor(paragraphNumber, wordNumber, charNumber);
+			((int)myStartCursor.paragraphCursor().index() == paragraphIndex)) {
+		moveStartCursor(paragraphIndex, elementIndex, charIndex);
 	}
 }
 
@@ -265,7 +327,7 @@
 }
 
 bool ZLTextView::canFindNext() const {
-	return !endCursor().isNull() && (myModel->nextMark(endCursor().position()).ParagraphNumber > -1);
+	return !endCursor().isNull() && (myModel->nextMark(endCursor().position()).ParagraphIndex > -1);
 }
 
 void ZLTextView::findNext() {
@@ -275,7 +337,7 @@
 }
 
 bool ZLTextView::canFindPrevious() const {
-	return !startCursor().isNull() && (myModel->previousMark(startCursor().position()).ParagraphNumber > -1);
+	return !startCursor().isNull() && (myModel->previousMark(startCursor().position()).ParagraphIndex > -1);
 }
 
 void ZLTextView::findPrevious() {
@@ -285,6 +347,11 @@
 }
 
 bool ZLTextView::onStylusPress(int x, int y) {
+	myDoubleClickInfo.update(x, y, true);
+	if (myDoubleClickInfo.Count > 10) {
+		return true;
+	}
+
 	mySelectionModel.deactivate();
 
   if (myModel.isNull()) {
@@ -293,7 +360,7 @@
 
 	shared_ptr<ZLTextPositionIndicatorInfo> indicatorInfo = this->indicatorInfo();
 	if (!indicatorInfo.isNull() &&
-			indicatorInfo->isVisible() &&
+			(indicatorInfo->type() == ZLTextPositionIndicatorInfo::FB_INDICATOR) &&
 			indicatorInfo->isSensitive()) {
 		myTreeStateIsFrozen = true;
 		bool indicatorAnswer = positionIndicator()->onStylusPress(x, y);
@@ -308,29 +375,29 @@
 		ZLTextTreeNodeMap::const_iterator it =
 			std::find_if(myTreeNodeMap.begin(), myTreeNodeMap.end(), ZLTextTreeNodeArea::RangeChecker(x, y));
 		if (it != myTreeNodeMap.end()) {
-			int paragraphNumber = it->ParagraphNumber;
-			ZLTextTreeParagraph *paragraph = (ZLTextTreeParagraph*)(*myModel)[paragraphNumber];
+			int paragraphIndex = it->ParagraphIndex;
+			ZLTextTreeParagraph *paragraph = (ZLTextTreeParagraph*)(*myModel)[paragraphIndex];
 
 			paragraph->open(!paragraph->isOpen());
 			rebuildPaintInfo(true);
 			preparePaintInfo();
 			if (paragraph->isOpen()) {
-				int nextParagraphNumber = paragraphNumber + paragraph->fullSize();
-				int lastParagraphNumber = endCursor().paragraphCursor().index();
+				int nextParagraphIndex = paragraphIndex + paragraph->fullSize();
+				int lastParagraphIndex = endCursor().paragraphCursor().index();
 				if (endCursor().isEndOfParagraph()) {
-					++lastParagraphNumber;
+					++lastParagraphIndex;
 				}
-				if (lastParagraphNumber < nextParagraphNumber) {
-					gotoParagraph(nextParagraphNumber, true);
+				if (lastParagraphIndex < nextParagraphIndex) {
+					gotoParagraph(nextParagraphIndex, true);
 					preparePaintInfo();
 				}
 			}
-			int firstParagraphNumber = startCursor().paragraphCursor().index();
+			int firstParagraphIndex = startCursor().paragraphCursor().index();
 			if (startCursor().isStartOfParagraph()) {
-				--firstParagraphNumber;
+				--firstParagraphIndex;
 			}
-			if (firstParagraphNumber >= paragraphNumber) {
-				gotoParagraph(paragraphNumber);
+			if (firstParagraphIndex >= paragraphIndex) {
+				gotoParagraph(paragraphIndex);
 				preparePaintInfo();
 			}
 			application().refreshWindow();
@@ -344,38 +411,90 @@
 
 void ZLTextView::activateSelection(int x, int y) {
 	if (isSelectionEnabled()) {
-		mySelectionModel.activate(x, y);
+		mySelectionModel.activate(visualX(x), y);
 		application().refreshWindow();
 	}
 }
 
+bool ZLTextView::onStylusMove(int x, int y) {
+	if (!myModel.isNull()) {
+		if (myModel->kind() == ZLTextModel::TREE_MODEL) {
+			ZLTextTreeNodeMap::const_iterator it =
+				std::find_if(myTreeNodeMap.begin(), myTreeNodeMap.end(), ZLTextTreeNodeArea::RangeChecker(x, y));
+			if (it != myTreeNodeMap.end()) {
+				application().setHyperlinkCursor(true);
+				return true;
+			}
+		}
+		application().setHyperlinkCursor(false);
+	}
+	return false;
+}
+
 bool ZLTextView::onStylusMovePressed(int x, int y) {
-	if (mySelectionModel.extendTo(x, y)) {
-		copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION);
+	if (mySelectionModel.extendTo(visualX(x), y)) {
 		application().refreshWindow();
+		copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION);
 	}
 	return true;
 }
 
 void ZLTextView::copySelectedTextToClipboard(ZLDialogManager::ClipboardType type) const {
 	if (ZLDialogManager::instance().isClipboardSupported(type)) {
-		std::string text = mySelectionModel.getText();
+		std::string text = mySelectionModel.text();
 		if (!text.empty()) {
 			ZLDialogManager::instance().setClipboardText(text, type);
+		} else {
+			shared_ptr<ZLImageData> image = mySelectionModel.image();
+			if (!image.isNull()) {
+				ZLDialogManager::instance().setClipboardImage(*image, type);
+			}
 		}
 	}
 }
 
-bool ZLTextView::onStylusRelease(int, int) {
-	mySelectionModel.deactivate();
+bool ZLTextView::onStylusClick(int x, int y, int count) {
+	if (count > 20) {
+		return true;
+	} else if (count > 10) {
+		mySelectionModel.extendWordSelectionToParagraph();
+		application().refreshWindow();
+		copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION);
+		myDoubleClickInfo.Count = 20;
+		return true;
+	} else if (count > 2) {
+		if (mySelectionModel.selectWord(visualX(x), y)) {
+			application().refreshWindow();
+			copySelectedTextToClipboard(ZLDialogManager::CLIPBOARD_SELECTION);
+			myDoubleClickInfo.Count = 10;
+			return true;
+		} else {
+			myDoubleClickInfo.Count = 0;
+		}
+	}
+
 	return true;
 }
 
-void ZLTextView::drawString(int x, int y, const char *str, int len, const ZLTextWord::Mark *mark, int shift) {
+bool ZLTextView::onStylusRelease(int x, int y) {
+	myDoubleClickInfo.update(x, y, false);
+
+	if (myDoubleClickInfo.Count > 0) {
+		return onStylusClick(x, y, myDoubleClickInfo.Count);
+	}
+
+	mySelectionModel.deactivate();
+	return false;
+}
+
+void ZLTextView::drawString(int x, int y, const char *str, int len, const ZLTextWord::Mark *mark, int shift, bool rtl) {
 	context().setColor(myStyle.textStyle()->color());
 	if (mark == 0) {
-		context().drawString(x, y, str, len);
+		context().drawString(x, y, str, len, rtl);
 	} else {
+		if (rtl) {
+			x += context().stringWidth(str, len, rtl);
+		}
 		int pos = 0;
 		for (; (mark != 0) && (pos < len); mark = mark->next()) {
 			int markStart = mark->start() - shift;
@@ -392,15 +511,25 @@
 
 			if (markStart > pos) {
 				int endPos = std::min(markStart, len);
-				context().drawString(x, y, str + pos, endPos - pos);
-				x += context().stringWidth(str + pos, endPos - pos);
+				if (rtl) {
+					x -= context().stringWidth(str + pos, endPos - pos, rtl);
+				}
+				context().drawString(x, y, str + pos, endPos - pos, rtl);
+				if (!rtl) {
+					x += context().stringWidth(str + pos, endPos - pos, rtl);
+				}
 			}
 			if (markStart < len) {
 				context().setColor(ZLTextStyleCollection::instance().baseStyle().SelectedTextColorOption.value());
 				{
 					int endPos = std::min(markStart + markLen, len);
-					context().drawString(x, y, str + markStart, endPos - markStart);
-					x += context().stringWidth(str + markStart, endPos - markStart);
+					if (rtl) {
+						x -= context().stringWidth(str + markStart, endPos - markStart, rtl);
+					}
+					context().drawString(x, y, str + markStart, endPos - markStart, rtl);
+					if (!rtl) {
+						x += context().stringWidth(str + markStart, endPos - markStart, rtl);
+					}
 				}
 				context().setColor(myStyle.textStyle()->color());
 			}
@@ -408,24 +537,27 @@
 		}
 
 		if (pos < len) {
-			context().drawString(x, y, str + pos, len - pos);
+			if (rtl) {
+				x -= context().stringWidth(str + pos, len - pos, rtl);
+			}
+			context().drawString(x, y, str + pos, len - pos, rtl);
 		}
 	}
 }
 
 void ZLTextView::drawWord(int x, int y, const ZLTextWord &word, int start, int length, bool addHyphenationSign) {
 	if ((start == 0) && (length == -1)) {
-		drawString(x, y, word.Data, word.Size, word.mark(), 0);
+		drawString(x, y, word.Data, word.Size, word.mark(), 0, word.BidiLevel % 2 == 1);
 	} else {
 		int startPos = ZLUnicodeUtil::length(word.Data, start);
 		int endPos = (length == -1) ? word.Size : ZLUnicodeUtil::length(word.Data, start + length);
 		if (!addHyphenationSign) {
-			drawString(x, y, word.Data + startPos, endPos - startPos, word.mark(), startPos);
+			drawString(x, y, word.Data + startPos, endPos - startPos, word.mark(), startPos, word.BidiLevel % 2 == 1);
 		} else {
 			std::string substr;
 			substr.append(word.Data + startPos, endPos - startPos);
 			substr += '-';
-			drawString(x, y, substr.data(), substr.length(), word.mark(), startPos);
+			drawString(x, y, substr.data(), substr.length(), word.mark(), startPos, word.BidiLevel % 2 == 1);
 		}
 	}
 }
@@ -434,8 +566,8 @@
 	rebuildPaintInfo(true);
 }
 
-void ZLTextView::highlightParagraph(int paragraphNumber) {
-	myModel->selectParagraph(paragraphNumber);
+void ZLTextView::highlightParagraph(int paragraphIndex) {
+	myModel->selectParagraph(paragraphIndex);
 	rebuildPaintInfo(true);
 }
 
@@ -445,47 +577,92 @@
 
 int ZLTextView::textAreaHeight() const {
 	shared_ptr<ZLTextPositionIndicatorInfo> indicatorInfo = this->indicatorInfo();
-	if (!indicatorInfo.isNull() && indicatorInfo->isVisible()) {
+	if (!indicatorInfo.isNull() && (indicatorInfo->type() == ZLTextPositionIndicatorInfo::FB_INDICATOR)) {
 		return viewHeight() - indicatorInfo->height() - indicatorInfo->offset();
 	} else {
 		return viewHeight();
 	}
 }
-/*
- *
-size_t ZLTextView::PositionIndicator::sizeOfTextBeforeParagraph(size_t paragraphNumber) const {
-	return myTextView.myTextSize[paragraphNumber] - myTextView.myTextSize[startTextIndex()];
-}
-
-size_t ZLTextView::PositionIndicator::sizeOfParagraph(size_t paragraphNumber) const {
-	return myTextView.myTextSize[paragraphNumber + 1] - myTextView.myTextSize[paragraphNumber];
-}
-*/
 
+void ZLTextView::gotoCharIndex(size_t charIndex) {
+	if (positionIndicator().isNull()) {
+		return;
+	}
 
-void ZLTextView::gotoPage(size_t index) {
-	const size_t symbolIndex = index * 2048 - 128;
-	std::vector<size_t>::const_iterator it = std::lower_bound(myTextSize.begin(), myTextSize.end(), symbolIndex);
 	std::vector<size_t>::const_iterator i = nextBreakIterator();
-	const size_t startIndex = (i != myTextBreaks.begin()) ? *(i - 1) : 0;
-	const size_t endIndex = (i != myTextBreaks.end()) ? *i : myModel->paragraphsNumber();
-	size_t paragraphNumber = std::min((size_t)(it - myTextSize.begin()), endIndex) - 1;
-	gotoParagraph(paragraphNumber, true);
+	const size_t startParagraphIndex = (i != myTextBreaks.begin()) ? *(i - 1) + 1 : 0;
+	const size_t endParagraphIndex = (i != myTextBreaks.end()) ? *i : myModel->paragraphsNumber();
+	const size_t fullTextSize = myTextSize[endParagraphIndex] - myTextSize[startParagraphIndex];
+	charIndex = std::min(charIndex, fullTextSize - 1);
+
+	std::vector<size_t>::const_iterator j = std::lower_bound(myTextSize.begin(), myTextSize.end(), charIndex + myTextSize[startParagraphIndex]);
+	size_t paragraphIndex = j - myTextSize.begin();
+	if ((*myModel)[paragraphIndex]->kind() == ZLTextParagraph::END_OF_SECTION_PARAGRAPH) {
+		gotoParagraph(paragraphIndex, true);
+		return;
+	}
+
+	if (paragraphIndex > startParagraphIndex) {
+		--paragraphIndex;
+	}
+	gotoParagraph(paragraphIndex, false);
 	preparePaintInfo();
-	const ZLTextWordCursor &cursor = endCursor();
-	if (!cursor.isNull() && (paragraphNumber == cursor.paragraphCursor().index())) {
-		if (!cursor.paragraphCursor().isLast() || !cursor.isEndOfParagraph()) {
-			size_t paragraphLength = cursor.paragraphCursor().paragraphLength();
-			if (paragraphLength > 0) {
-				size_t wordNum =
-					(myTextSize[startIndex] + symbolIndex - myTextSize[paragraphNumber]) *
-					paragraphLength / (myTextSize[endIndex] - myTextSize[startIndex]);
-				moveEndCursor(cursor.paragraphCursor().index(), wordNum, 0);
+	if (!positionIndicator().isNull()) {
+		size_t endCharIndex = positionIndicator()->sizeOfTextBeforeCursor(endCursor());
+		if (endCharIndex > charIndex) {
+			while (endCharIndex > charIndex) {
+				scrollPage(false, SCROLL_LINES, 1);
+				preparePaintInfo();
+				if (positionIndicator()->sizeOfTextBeforeCursor(startCursor()) <= myTextSize[startParagraphIndex]) {
+					break;
+				}
+				endCharIndex = positionIndicator()->sizeOfTextBeforeCursor(endCursor());
+			}
+			if (endCharIndex < charIndex) {
+				scrollPage(true, SCROLL_LINES, 1);
+			}
+		} else {
+			int startCharIndex = positionIndicator()->sizeOfTextBeforeCursor(startCursor());
+			while (endCharIndex < charIndex) {
+				scrollPage(true, SCROLL_LINES, 1);
+				preparePaintInfo();
+				const int newStartCharIndex = positionIndicator()->sizeOfTextBeforeCursor(startCursor());
+				if (newStartCharIndex <= startCharIndex) {
+					break;
+				}
+				startCharIndex = newStartCharIndex;
+				endCharIndex = positionIndicator()->sizeOfTextBeforeCursor(endCursor());
+			}
+			if (endCharIndex > charIndex) {
+				scrollPage(false, SCROLL_LINES, 1);
 			}
 		}
 	}
 }
 
+void ZLTextView::gotoPage(size_t index) {
+	size_t charIndex = (index - 1) * 2048;
+	std::vector<size_t>::const_iterator it = std::lower_bound(myTextSize.begin(), myTextSize.end(), charIndex);
+	const int paraIndex = it - myTextSize.begin();
+	const ZLTextParagraph &para = *(*myModel)[paraIndex];
+	switch (para.kind()) {
+		case ZLTextParagraph::END_OF_TEXT_PARAGRAPH:
+		case ZLTextParagraph::END_OF_SECTION_PARAGRAPH:
+			charIndex = myTextSize[paraIndex - 1];
+			break;
+		default:
+			break;
+	}
+	gotoCharIndex(charIndex);
+}
+
+size_t ZLTextView::pageIndex() {
+	if (empty() || positionIndicator().isNull() || endCursor().isNull()) {
+		return 0;
+	}
+	return positionIndicator()->sizeOfTextBeforeCursor(endCursor()) / 2048 + 1;
+}
+
 size_t ZLTextView::pageNumber() const {
 	if (empty()) {
 		return 0;
@@ -495,3 +672,72 @@
 	const size_t endIndex = (i != myTextBreaks.end()) ? *i : myModel->paragraphsNumber();
 	return (myTextSize[endIndex] - myTextSize[startIndex]) / 2048 + 1;
 }
+
+void ZLTextView::onScrollbarMoved(Direction direction, size_t full, size_t from, size_t to) {
+	if (direction != VERTICAL) {
+		return;
+	}
+
+	mySelectionModel.deactivate();
+
+  if (myModel.isNull()) {
+	  return;
+	}
+
+	if (startCursor().isNull() || endCursor().isNull()) {
+		return;
+	}
+
+	myTreeStateIsFrozen = true;
+	if (from == 0) {
+		scrollToStartOfText();
+	} else if (to == full) {
+		scrollToEndOfText();
+	} else {
+		gotoCharIndex(to);
+	}
+	preparePaintInfo();
+	myTreeStateIsFrozen = false;
+	myDoUpdateScrollbar = false;
+	application().refreshWindow();
+}
+
+void ZLTextView::onScrollbarStep(Direction direction, int steps) {
+	if (direction == VERTICAL) {
+		const bool forward = steps > 0;
+		scrollPage(forward, SCROLL_LINES, forward ? steps : -steps);
+		application().refreshWindow();
+	}
+}
+
+void ZLTextView::onScrollbarPageStep(Direction direction, int steps) {
+	if (direction == VERTICAL) {
+		const bool forward = steps > 0;
+		scrollPage(forward, NO_OVERLAPPING, forward ? steps : -steps);
+		application().refreshWindow();
+	}
+}
+
+void ZLTextView::forceScrollbarUpdate() {
+	myDoUpdateScrollbar = true;
+}
+
+ZLTextView::DoubleClickInfo::DoubleClickInfo() {
+	Count = 0;
+}
+
+void ZLTextView::DoubleClickInfo::update(int x, int y, bool press) {
+	ZLTime current;
+	int dcDeltaX = X - x;
+	int dcDeltaY = Y - y;
+	if ((current.millisecondsFrom(Time) < 200) &&
+			(dcDeltaX > -5) && (dcDeltaX < 5) &&
+			(dcDeltaY > -5) && (dcDeltaY < 5)) {
+		++Count;
+	} else {
+		Count = press ? 1 : 0;
+	}
+	X = x;
+	Y = y;
+	Time = current;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextView.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,7 @@
 #include <string>
 #include <algorithm>
 
+#include <ZLTime.h>
 #include <ZLOptions.h>
 #include <ZLView.h>
 #include <ZLDialogManager.h>
@@ -34,6 +35,7 @@
 #include <ZLTextParagraphCursor.h>
 #include <ZLTextSelectionModel.h>
 #include <ZLTextArea.h>
+#include <ZLTextParagraph.h>
 
 class ZLTextModel;
 class ZLTextMark;
@@ -81,15 +83,17 @@
 		std::string timeString() const;
 		size_t sizeOfParagraph(size_t paragraphNumber) const;
 		size_t sizeOfTextBeforeParagraph(size_t paragraphNumber) const;
-		size_t sizeOfTextBeforeCursor() const;
+		size_t sizeOfTextBeforeCursor(const ZLTextWordCursor &cursor) const;
 
 	private:
 		ZLTextView &myTextView;
 		const ZLTextPositionIndicatorInfo &myInfo;
 		int myExtraWidth;
+
+	friend class ZLTextView;
 	};
 
-	friend class ZLTextView::PositionIndicator;
+friend class ZLTextView::PositionIndicator;
 	
 private:
 	class ViewStyle {
@@ -100,23 +104,38 @@
 		void setPaintContext(shared_ptr<ZLPaintContext> context);
 
 		void reset();
-		void setTextStyle(const ZLTextStylePtr style);
+		void setTextStyle(const ZLTextStylePtr style, unsigned char bidiLevel);
+
+	private:
 		void applyControl(const ZLTextControlElement &control);
-		void applyControl(const ZLTextForcedControlElement &control);
+		void applyControl(const ZLTextStyleElement &control);
+		void increaseBidiLevel();
+		void decreaseBidiLevel();
+
+	public:
+		void applySingleControl(const ZLTextElement &element);
 		void applyControls(const ZLTextWordCursor &begin, const ZLTextWordCursor &end);
 
 		const ZLPaintContext &context() const;
 		const ZLTextStylePtr textStyle() const;
-		int elementWidth(const ZLTextElement &element, unsigned int charNumber) const;
-		int elementHeight(const ZLTextElement &element) const;
+		int elementWidth(const ZLTextElement &element, unsigned int charNumber, const ZLTextStyleEntry::Metrics &metrics) const;
+		int elementHeight(const ZLTextElement &element, const ZLTextStyleEntry::Metrics &metrics) const;
 		int elementDescent(const ZLTextElement &element) const;
 
 		int wordWidth(const ZLTextWord &word, int start = 0, int length = -1, bool addHyphenationSign = false) const;
 
+		void setBaseBidiLevel(unsigned char base);
+		unsigned char baseBidiLevel() const;
+		bool baseIsRtl() const;
+		
+		unsigned char bidiLevel() const;
+
 	private:
 		ZLTextStylePtr myTextStyle;
 		shared_ptr<ZLPaintContext> myContext;
 		mutable int myWordHeight;
+		unsigned char myBaseBidiLevel;
+		unsigned char myBidiLevel;
 	};
 
 protected:
@@ -127,8 +146,10 @@
 
 public:
 	void clearCaches();
+	void forceScrollbarUpdate();
 
 	void gotoPage(size_t index);
+	size_t pageIndex();
 	size_t pageNumber() const;
 
 	void scrollPage(bool forward, ScrollingMode mode, unsigned int value);
@@ -136,13 +157,13 @@
 	void scrollToEndOfText();
 
 	void gotoMark(ZLTextMark mark);
-	virtual void gotoParagraph(int num, bool last = false);
+	virtual void gotoParagraph(int num, bool end = false);
 	void gotoPosition(int paragraphNumber, int wordNumber, int charNumber);
 
 	const ZLTextWordCursor &startCursor() const;
 	const ZLTextWordCursor &endCursor() const;
 
-	virtual void setModel(shared_ptr<ZLTextModel> model);
+	virtual void setModel(shared_ptr<ZLTextModel> model, const std::string &language);
 	const shared_ptr<ZLTextModel> model() const;
 
 	bool hasMultiSectionModel() const;
@@ -155,18 +176,26 @@
 	void highlightParagraph(int paragraphNumber);
 
 	ZLTextSelectionModel &selectionModel();
+	const ZLTextSelectionModel &selectionModel() const;
 	void copySelectedTextToClipboard(ZLDialogManager::ClipboardType type) const;
-	
+
+	virtual bool isSelectionEnabled() const = 0;
+
 protected:
 	bool onStylusPress(int x, int y);
+	bool onStylusMove(int x, int y);
 	bool onStylusMovePressed(int x, int y);
 	bool onStylusRelease(int x, int y);
+	virtual bool onStylusClick(int x, int y, int count);
+	void onScrollbarMoved(Direction direction, size_t full, size_t from, size_t to);
+	void onScrollbarStep(Direction direction, int steps);
+	void onScrollbarPageStep(Direction direction, int steps);
 	void activateSelection(int x, int y);
 
 	virtual void paint();
 
-	int paragraphIndexByCoordinate(int y) const;
 	const ZLTextElementArea *elementByCoordinates(int x, int y) const;
+	int paragraphIndexByCoordinates(int x, int y) const;
 
 	void rebuildPaintInfo(bool strong);
 	virtual void preparePaintInfo();
@@ -181,21 +210,25 @@
 	virtual int rightMargin() const = 0;
 	virtual int topMargin() const = 0;
 	virtual int bottomMargin() const = 0;
-	virtual bool isSelectionEnabled() const = 0;
 
 private:
+	int lineStartMargin() const;
+	int lineEndMargin() const;
+	int visualX(int logicalX) const;
+
 	void moveStartCursor(int paragraphNumber, int wordNumber = 0, int charNumber = 0);
 	void moveEndCursor(int paragraphNumber, int wordNumber = 0, int charNumber = 0);
 
 	void clear();
 
-	int areaLength(const ZLTextParagraphCursor &paragraph, const ZLTextElementArea &area, int toCharNumber);
+	int areaBound(const ZLTextParagraphCursor &paragraph, const ZLTextElementArea &area, int toCharNumber, bool mainDir);
 	ZLTextLineInfoPtr processTextLine(const ZLTextWordCursor &start, const ZLTextWordCursor &end);
-	void prepareTextLine(const ZLTextLineInfo &info);
-	void drawTextLine(const ZLTextLineInfo &info, size_t from, size_t to);
+	void prepareTextLine(const ZLTextLineInfo &info, int y);
+	void drawTextLine(const ZLTextLineInfo &info, int y, size_t from, size_t to);
+	void drawSelectionRectangle(int left, int top, int right, int bottom);
 	void drawWord(int x, int y, const ZLTextWord &word, int start, int length, bool addHyphenationSign);
-	void drawString(int x, int y, const char *str, int len, const ZLTextWord::Mark *mark, int shift);
-	void drawTreeLines(const ZLTextTreeNodeInfo &info, int height, int vSpaceAfter);
+	void drawString(int x, int y, const char *str, int len, const ZLTextWord::Mark *mark, int shift, bool rtl);
+	void drawTreeLines(const ZLTextTreeNodeInfo &info, int x, int y, int height, int vSpaceAfter);
 
 	bool pageIsEmpty() const;
 	ZLTextWordCursor findLineFromStart(unsigned int overlappingValue) const;
@@ -221,8 +254,14 @@
 	int viewHeight() const;
 	int textAreaHeight() const;
 
+	void addAreaToTextMap(const ZLTextElementArea &area);
+	void flushRevertedElements(unsigned char bidiLevel);
+
+	void gotoCharIndex(size_t charIndex);
+
 private:
 	shared_ptr<ZLTextModel> myModel;
+	std::string myLanguage;
 
 	enum {
 		NOTHING_TO_PAINT,
@@ -243,6 +282,7 @@
 	int myOldWidth, myOldHeight;
 
 	ZLTextElementMap myTextElementMap;
+	std::vector<ZLTextElementMap> myTextElementsToRevert;
 	ZLTextTreeNodeMap myTreeNodeMap;
 
 	std::vector<size_t> myTextSize;
@@ -254,6 +294,17 @@
 	shared_ptr<PositionIndicator> myPositionIndicator;
 
 	bool myTreeStateIsFrozen;
+	bool myDoUpdateScrollbar;
+
+	struct DoubleClickInfo {
+		DoubleClickInfo();
+		void update(int x, int y, bool press);
+
+		int Count;
+		ZLTime Time;
+		int X;
+		int Y;
+	} myDoubleClickInfo;
 
 friend class ZLTextSelectionModel;
 };
@@ -261,12 +312,19 @@
 inline ZLTextView::ViewStyle::~ViewStyle() {}
 inline const ZLPaintContext &ZLTextView::ViewStyle::context() const { return *myContext; }
 inline const ZLTextStylePtr ZLTextView::ViewStyle::textStyle() const { return myTextStyle; }
+inline void ZLTextView::ViewStyle::setBaseBidiLevel(unsigned char base) { myBaseBidiLevel = base; myBidiLevel = base; }
+inline unsigned char ZLTextView::ViewStyle::baseBidiLevel() const { return myBaseBidiLevel; }
+inline bool ZLTextView::ViewStyle::baseIsRtl() const { return myBaseBidiLevel % 2 == 1; }
+inline void ZLTextView::ViewStyle::increaseBidiLevel() { ++myBidiLevel; }
+inline void ZLTextView::ViewStyle::decreaseBidiLevel() { if (myBidiLevel > myBaseBidiLevel) --myBidiLevel; }
+inline unsigned char ZLTextView::ViewStyle::bidiLevel() const { return myBidiLevel; }
 
 inline bool ZLTextView::empty() const { return myPaintState == NOTHING_TO_PAINT; }
 inline const ZLTextWordCursor &ZLTextView::startCursor() const { return myStartCursor; }
 inline const ZLTextWordCursor &ZLTextView::endCursor() const { return myEndCursor; }
 inline const shared_ptr<ZLTextModel> ZLTextView::model() const { return myModel; }
 inline ZLTextSelectionModel &ZLTextView::selectionModel() { return mySelectionModel; }
+inline const ZLTextSelectionModel &ZLTextView::selectionModel() const { return mySelectionModel; }
 
 inline int ZLTextView::viewWidth() const {
 	return std::max(myStyle.context().width() - leftMargin() - rightMargin(), 1);
@@ -276,4 +334,16 @@
 	return std::max(myStyle.context().height() - topMargin() - bottomMargin(), 1);
 }
 
+inline int ZLTextView::visualX(int logicalX) const {
+	return myStyle.baseIsRtl() ? context().width() - logicalX - 1 : logicalX;
+}
+
+inline int ZLTextView::lineStartMargin() const {
+	return myStyle.baseIsRtl() ? rightMargin() : leftMargin();
+}
+
+inline int ZLTextView::lineEndMargin() const {
+	return myStyle.baseIsRtl() ? leftMargin() : rightMargin();
+}
+
 #endif /* __ZLTEXTVIEW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextView_paint.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextView_paint.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextView_paint.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextView_paint.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <algorithm>
+
 #include <ZLUnicodeUtil.h>
 
 #include "ZLTextView.h"
@@ -36,244 +38,344 @@
 	std::vector<size_t> labels;
 	labels.reserve(myLineInfos.size() + 1);
 	labels.push_back(0);
-	context().moveYTo(topMargin());
+
+	int y = topMargin();
 	for (std::vector<ZLTextLineInfoPtr>::const_iterator it = myLineInfos.begin(); it != myLineInfos.end(); ++it) {
-		prepareTextLine(**it);
+		const ZLTextLineInfo &info = **it;
+		prepareTextLine(info, y);
+		y += info.Height + info.Descent + info.VSpaceAfter;
 		labels.push_back(myTextElementMap.size());
 	}
+
 	mySelectionModel.update();
-	context().moveYTo(topMargin());
+
+	y = topMargin();
 	int index = 0;
 	for (std::vector<ZLTextLineInfoPtr>::const_iterator it = myLineInfos.begin(); it != myLineInfos.end(); ++it) {
-		drawTextLine(**it, labels[index], labels[index + 1]);
+		const ZLTextLineInfo &info = **it;
+		drawTextLine(info, y, labels[index], labels[index + 1]);
+		y += info.Height + info.Descent + info.VSpaceAfter;
 		++index;
 	}
 
 	shared_ptr<ZLTextPositionIndicatorInfo> indicatorInfo = this->indicatorInfo();
-	if (!indicatorInfo.isNull() && indicatorInfo->isVisible()) {
+	if (!indicatorInfo.isNull() && (indicatorInfo->type() == ZLTextPositionIndicatorInfo::FB_INDICATOR)) {
 		positionIndicator()->draw();
 	}
 
+	if (myDoUpdateScrollbar && !indicatorInfo.isNull()) {
+		myDoUpdateScrollbar = false;
+		const size_t full = positionIndicator()->sizeOfTextBeforeParagraph(positionIndicator()->endTextIndex());
+		const size_t from = positionIndicator()->sizeOfTextBeforeCursor(startCursor());
+		const size_t to = positionIndicator()->sizeOfTextBeforeCursor(endCursor());
+
+		bool showScrollbar =
+			(indicatorInfo->type() == ZLTextPositionIndicatorInfo::OS_SCROLLBAR) &&
+			(to - from < full);
+		if (showScrollbar) {
+			setScrollbarEnabled(VERTICAL, true);
+			setScrollbarParameters(VERTICAL, full, from, to);
+		} else {
+			setScrollbarEnabled(VERTICAL, false);
+		}
+	}
+
 	ZLTextParagraphCursorCache::cleanup();
 }
 
-static bool operator <= (const ZLTextElementArea &area, const ZLTextSelectionModel::BoundElement &element) {
-	return
-		(area.ParagraphNumber < element.ParagraphNumber) ||
-		((area.ParagraphNumber == element.ParagraphNumber) &&
-		 (area.TextElementNumber <= element.TextElementNumber));
+int ZLTextView::areaBound(const ZLTextParagraphCursor &paragraph, const ZLTextElementArea &area, int toCharIndex, bool mainDir) {
+	myStyle.setTextStyle(area.Style, area.BidiLevel);
+	const ZLTextWord &word = (const ZLTextWord&)paragraph[area.ElementIndex];
+	int length = toCharIndex - area.StartCharIndex;
+	bool selectHyphenationSign = false;
+	if (length >= area.Length) {
+		selectHyphenationSign = area.AddHyphenationSign;
+		length = area.Length;
+	}
+	int areaLen = (length > 0) ?
+		myStyle.wordWidth(word, area.StartCharIndex, length, selectHyphenationSign) : 0;
+	return mainDir ? area.XStart + areaLen : area.XEnd - areaLen;
 }
 
-static bool operator > (const ZLTextElementArea &area, const ZLTextSelectionModel::BoundElement &element) {
-	return !(area <= element);
-}
+typedef std::vector<ZLTextSelectionModel::Range> RangeVector;
 
-static bool operator < (const ZLTextWordCursor &cursor, const ZLTextSelectionModel::BoundElement &element) {
-	int pn = cursor.paragraphCursor().index();
+bool contains(const ZLTextSelectionModel::Range &range, const ZLTextElementArea &area) {
 	return
-		(pn < element.ParagraphNumber) ||
-		((pn == element.ParagraphNumber) &&
-		 (((int)cursor.wordNumber() < element.TextElementNumber) ||
-		  (((int)cursor.wordNumber() == element.TextElementNumber) &&
-			 (cursor.charNumber() < element.CharNumber))));
+		((range.first.ParagraphIndex < area.ParagraphIndex) ||
+		 ((range.first.ParagraphIndex == area.ParagraphIndex) &&
+			(range.first.ElementIndex <= area.ElementIndex))) &&
+		((range.second.ParagraphIndex > area.ParagraphIndex) ||
+		 ((range.second.ParagraphIndex == area.ParagraphIndex) &&
+			(range.second.ElementIndex >= area.ElementIndex)));
 }
 
-static bool operator >= (const ZLTextWordCursor &cursor, const ZLTextSelectionModel::BoundElement &element) {
-	return !(cursor < element);
-}
-
-static bool operator > (const ZLTextWordCursor &cursor, const ZLTextSelectionModel::BoundElement &element) {
-	int pn = cursor.paragraphCursor().index();
+bool strongContains(const ZLTextSelectionModel::Range &range, const ZLTextWordCursor &cursor) {
+	const int pn = cursor.paragraphCursor().index();
+	const int wn = cursor.elementIndex();
 	return
-		(pn > element.ParagraphNumber) ||
-		((pn == element.ParagraphNumber) &&
-		 (((int)cursor.wordNumber() > element.TextElementNumber) ||
-		  (((int)cursor.wordNumber() == element.TextElementNumber) &&
-			 (cursor.charNumber() > element.CharNumber))));
+		((range.first.ParagraphIndex < pn) ||
+		 ((range.first.ParagraphIndex == pn) &&
+			(range.first.ElementIndex < wn))) &&
+		((range.second.ParagraphIndex > pn) ||
+		 ((range.second.ParagraphIndex == pn) &&
+			(range.second.ElementIndex > wn)));
 }
 
-static bool operator <= (const ZLTextWordCursor &cursor, const ZLTextSelectionModel::BoundElement &element) {
-	return !(cursor > element);
+static RangeVector::const_iterator findRange(const RangeVector &ranges, const ZLTextElementArea &area) {
+	// TODO: binary search
+	for (RangeVector::const_iterator it = ranges.begin(); it != ranges.end(); ++it) {
+		if (contains(*it, area)) {
+			return it;
+		}
+	}
+	return ranges.end();
 }
 
-static ZLTextElementIterator findLast(ZLTextElementIterator from, ZLTextElementIterator to, const ZLTextSelectionModel::BoundElement &bound) {
-	if (*from > bound) {
-		return from;
-	}
-	for (++from; (from != to) && (*from <= bound); ++from) {
+static RangeVector::const_iterator strongFindRange(const RangeVector &ranges, const ZLTextWordCursor &cursor) {
+	// TODO: binary search
+	for (RangeVector::const_iterator it = ranges.begin(); it != ranges.end(); ++it) {
+		if (strongContains(*it, cursor)) {
+			return it;
+		}
 	}
-	return --from;
+	return ranges.end();
 }
 
-int ZLTextView::areaLength(const ZLTextParagraphCursor &paragraph, const ZLTextElementArea &area, int toCharNumber) {
-	myStyle.setTextStyle(area.Style);
-	const ZLTextWord &word = (const ZLTextWord&)paragraph[area.TextElementNumber];
-	int length = toCharNumber - area.StartCharNumber;
-	bool selectHyphenationSign = false;
-	if (length >= area.Length) {
-		selectHyphenationSign = area.AddHyphenationSign;
-		length = area.Length;
+void ZLTextView::drawSelectionRectangle(int left, int top, int right, int bottom) {
+	left = std::max(left, lineStartMargin());
+	right = std::min(right, viewWidth() + lineStartMargin() - 1);
+	if (left < right) {
+		context().setFillColor(ZLTextStyleCollection::instance().baseStyle().SelectionBackgroundColorOption.value());
+		context().fillRectangle(visualX(left), top, visualX(right), bottom);
 	}
-	if (length > 0) {
-		return myStyle.wordWidth(word, area.StartCharNumber, length, selectHyphenationSign);
-	}
-	return 0;
 }
 
-void ZLTextView::drawTextLine(const ZLTextLineInfo &info, size_t from, size_t to) {
+void ZLTextView::drawTextLine(const ZLTextLineInfo &info, int y, size_t from, size_t to) {
 	const ZLTextParagraphCursor &paragraph = info.RealStart.paragraphCursor();
 
 	const ZLTextElementIterator fromIt = myTextElementMap.begin() + from;
 	const ZLTextElementIterator toIt = myTextElementMap.begin() + to;
 
 	if (!mySelectionModel.isEmpty() && (from != to)) {
-		std::pair<ZLTextSelectionModel::BoundElement,ZLTextSelectionModel::BoundElement> range = mySelectionModel.range();
+		const std::vector<ZLTextSelectionModel::Range> &ranges = mySelectionModel.ranges();
 
-		int left = viewWidth() + leftMargin() - 1;
-		if (info.Start > range.first) {
-			left = leftMargin();
-		} else if (info.End >= range.first) {
-			ZLTextElementIterator jt = findLast(fromIt, toIt, range.first);
-			left = jt->XStart;
-			if (jt->Kind == ZLTextElement::WORD_ELEMENT) {
-				left += areaLength(paragraph, *jt, range.first.CharNumber);
+		if (!ranges.empty()) {
+			RangeVector::const_iterator rt = ranges.end();
+			const int top = y + 1;
+			int bottom = y + info.Height + info.Descent;
+			if (strongFindRange(ranges, info.End) != ranges.end()) {
+				bottom += info.VSpaceAfter;
 			}
-		}
-
-		const int top = context().y() + 1;
-		int bottom = context().y() + info.Height + info.Descent;
-		int right = leftMargin();
-		if (info.End < range.second) {
-			right = viewWidth() + leftMargin() - 1;
-			bottom += info.VSpaceAfter;
-		} else if (info.Start <= range.second) {
-			ZLTextElementIterator jt = findLast(fromIt, toIt, range.second);
-			if (jt->Kind == ZLTextElement::WORD_ELEMENT) {
-				right = jt->XStart + areaLength(paragraph, *jt, range.second.CharNumber) - 1;
-			} else {
-				right = jt->XEnd - 1;
+			int left = viewWidth() + lineStartMargin() - 1;
+			int right = lineStartMargin();
+			const int baseRTL = myStyle.baseBidiLevel() % 2;
+
+			for (ZLTextElementIterator it = fromIt; it < toIt; ++it) {
+				const ZLTextElementArea &area = *it;
+				RangeVector::const_iterator rt2 = findRange(ranges, area);
+				if (rt2 == rt) {
+					if (rt != ranges.end()) {
+						const bool mainDir = area.BidiLevel % 2 == baseRTL;
+						int r = area.XEnd;
+						const ZLTextSelectionModel::BoundElement &bound =
+							mainDir ? rt->second : rt->first;
+						if (bound.ElementIndex == area.ElementIndex) {
+							const ZLTextElement &element = paragraph[area.ElementIndex];
+							if (element.kind() == ZLTextElement::WORD_ELEMENT) {
+								r = areaBound(paragraph, area, bound.CharIndex, mainDir);
+							}
+						}
+						right = std::max(right, r);
+					}
+				} else {
+					if (rt != ranges.end()) {
+						drawSelectionRectangle(left, top, right, bottom);
+						left = viewWidth() + lineStartMargin() - 1;
+						right = lineStartMargin();
+					}
+					rt = rt2;
+					if (rt != ranges.end()) {
+						if ((it == fromIt) &&
+								(info.StartBidiLevel % 2 == baseRTL) &&
+								strongContains(*rt, info.Start)) {
+							left = lineStartMargin();
+						}
+
+						const bool mainDir = area.BidiLevel % 2 == baseRTL;
+
+						int l = area.XStart - 1;
+						int r = area.XEnd;
+
+						const ZLTextSelectionModel::BoundElement &rightBound =
+							mainDir ? rt->second : rt->first;
+						const ZLTextSelectionModel::BoundElement &leftBound =
+							mainDir ? rt->first : rt->second;
+						if (paragraph[area.ElementIndex].kind() == ZLTextElement::WORD_ELEMENT) {
+							if (rightBound.ElementIndex == area.ElementIndex) {
+								r = areaBound(paragraph, area, rightBound.CharIndex, mainDir);
+							}
+							if (leftBound.ElementIndex == area.ElementIndex) {
+								l = areaBound(paragraph, area, leftBound.CharIndex, mainDir);
+							}
+						}
+
+						left = std::min(left, l);
+						right = std::max(right, r);
+					}
+				}
+			}
+			if (rt != ranges.end()) {
+				if ((paragraph.index() < (size_t)rt->second.ParagraphIndex) &&
+						strongContains(*rt, info.End)) {
+					right = viewWidth() + lineStartMargin() - 1;
+				}
+				drawSelectionRectangle(left, top, right, bottom);
 			}
-		}
-
-		if (left < right) {
-			context().setFillColor(ZLTextStyleCollection::instance().baseStyle().SelectionBackgroundColorOption.value());
-			context().fillRectangle(left, top, right, bottom);
 		}
 	}
 
-	context().moveY(info.Height);
-	int maxY = topMargin() + textAreaHeight();
-	if (context().y() > maxY) {
-	  context().moveYTo(maxY);
-	}
-	context().moveXTo(leftMargin());
+	y = std::min(y + info.Height, topMargin() + textAreaHeight());
+	int x = lineStartMargin();
 	if (!info.NodeInfo.isNull()) {
-		drawTreeLines(*info.NodeInfo, info.Height, info.Descent + info.VSpaceAfter);
+		drawTreeLines(*info.NodeInfo, x, y, info.Height, info.Descent + info.VSpaceAfter);
 	}
 	ZLTextElementIterator it = fromIt;
-	for (ZLTextWordCursor pos = info.RealStart; !pos.equalWordNumber(info.End); pos.nextWord()) {
-		const ZLTextElement &element = paragraph[pos.wordNumber()];
+	const int endElementIndex = info.End.elementIndex();
+	for (; (it != toIt) && (it->ElementIndex != endElementIndex); ++it) {
+		const ZLTextElement &element = paragraph[it->ElementIndex];
 		ZLTextElement::Kind kind = element.kind();
 	
 		if ((kind == ZLTextElement::WORD_ELEMENT) || (kind == ZLTextElement::IMAGE_ELEMENT)) {
-			if (it->ChangeStyle) {
-				myStyle.setTextStyle(it->Style);
-			}
-			const int x = it->XStart;
-			const int y = it->YEnd - myStyle.elementDescent(element) - myStyle.textStyle()->verticalShift();
+			myStyle.setTextStyle(it->Style, it->BidiLevel);
+			const int wx = myStyle.baseIsRtl() ? context().width() - it->XEnd : it->XStart;
+			const int wy = it->YEnd - myStyle.elementDescent(element) - myStyle.textStyle()->verticalShift();
 			if (kind == ZLTextElement::WORD_ELEMENT) {
-				drawWord(x, y, (const ZLTextWord&)element, pos.charNumber(), -1, false);
+				drawWord(wx, wy, (const ZLTextWord&)element, it->StartCharIndex, -1, false);
 			} else {
-				context().drawImage(x, y, ((const ZLTextImageElement&)element).image());
+				context().drawImage(wx, wy, *((const ZLTextImageElement&)element).image());
 			}
-			++it;
 		}
 	}
 	if (it != toIt) {
-		if (it->ChangeStyle) {
-			myStyle.setTextStyle(it->Style);
-		}
+		myStyle.setTextStyle(it->Style, it->BidiLevel);
 		int start = 0;
-		if (info.Start.equalWordNumber(info.End)) {
-			start = info.Start.charNumber();
+		if (info.Start.equalElementIndex(info.End)) {
+			start = info.Start.charIndex();
 		}
-		int len = info.End.charNumber() - start;
+		int len = info.End.charIndex() - start;
 		const ZLTextWord &word = (const ZLTextWord&)info.End.element();
 		context().setColor(myStyle.textStyle()->color());
-		const int x = it->XStart;
+		const int x = myStyle.baseIsRtl() ? context().width() - it->XEnd : it->XStart;
 		const int y = it->YEnd - myStyle.elementDescent(word) - myStyle.textStyle()->verticalShift();
 		drawWord(x, y, word, start, len, it->AddHyphenationSign);
 	}
-	context().moveY(info.Descent + info.VSpaceAfter);
 }
 
-void ZLTextView::prepareTextLine(const ZLTextLineInfo &info) {
-	myStyle.setTextStyle(info.StartStyle);
-	const int y = std::min(context().y() + info.Height, topMargin() + textAreaHeight());
+void ZLTextView::addAreaToTextMap(const ZLTextElementArea &area) {
+	const unsigned char index = myStyle.bidiLevel() - myStyle.baseBidiLevel();
+	if (index > 0) {
+		while (myTextElementsToRevert.size() < index) {
+			myTextElementsToRevert.push_back(ZLTextElementMap());
+		}
+		myTextElementsToRevert[index - 1].push_back(area);
+	} else {
+		myTextElementMap.push_back(area);
+	}
+}
+
+void ZLTextView::flushRevertedElements(unsigned char bidiLevel) {
+	const int index = (int)bidiLevel - (int)myStyle.baseBidiLevel();
+	if ((index < 0) || (myTextElementsToRevert.size() <= (size_t)index)) {
+		return;
+	}
+	ZLTextElementMap &from =
+		myTextElementsToRevert[index];
+	ZLTextElementMap &to = (index > 0) ?
+		myTextElementsToRevert[index - 1] :
+		myTextElementMap;
+	if (!from.empty()) {
+		const int sum = from[from.size() - 1].XEnd + from[0].XStart;
+		for (ZLTextElementMap::reverse_iterator it = from.rbegin(); it != from.rend(); ++it) {
+			int tmp = sum - it->XStart;
+			it->XStart = sum - it->XEnd;
+			it->XEnd = tmp;
+			to.push_back(*it);
+		}
+		from.clear();
+	}
+}
+
+void ZLTextView::prepareTextLine(const ZLTextLineInfo &info, int y) {
+	y = std::min(y + info.Height, topMargin() + textAreaHeight());
+
+	myStyle.setTextStyle(info.StartStyle, info.StartBidiLevel);
 	int spaceCounter = info.SpaceCounter;
 	int fullCorrection = 0;
 	const bool endOfParagraph = info.End.isEndOfParagraph();
 	bool wordOccured = false;
-	bool changeStyle = true;
 
-	context().moveXTo(leftMargin() + info.LeftIndent);
+	int x = lineStartMargin() + info.StartIndent;
+
+	const int fontSize = myStyle.textStyle()->fontSize();
+	// TODO: change metrics at font change
+	const ZLTextStyleEntry::Metrics metrics(fontSize, fontSize / 2, viewWidth(), textAreaHeight());
 
 	switch (myStyle.textStyle()->alignment()) {
 		case ALIGN_RIGHT:
-			context().moveX(leftMargin() + viewWidth() - myStyle.textStyle()->rightIndent() - info.Width);
+			if (!myStyle.baseIsRtl()) {
+				x += metrics.FullWidth - myStyle.textStyle()->lineEndIndent(metrics, myStyle.baseIsRtl()) - info.Width;
+			}
+			break;
+		case ALIGN_LEFT:
+			if (myStyle.baseIsRtl()) {
+				x += metrics.FullWidth - myStyle.textStyle()->lineEndIndent(metrics, myStyle.baseIsRtl()) - info.Width;
+			}
 			break;
 		case ALIGN_CENTER:
-			context().moveX(leftMargin() + (viewWidth() - myStyle.textStyle()->rightIndent() - info.Width) / 2);
+			x += (metrics.FullWidth - myStyle.textStyle()->lineEndIndent(metrics, myStyle.baseIsRtl()) - info.Width) / 2;
 			break;
 		case ALIGN_JUSTIFY:
 			if (!endOfParagraph && (info.End.element().kind() != ZLTextElement::AFTER_PARAGRAPH_ELEMENT)) {
-				fullCorrection = viewWidth() - myStyle.textStyle()->rightIndent() - info.Width;
+				fullCorrection = metrics.FullWidth - myStyle.textStyle()->lineEndIndent(metrics, myStyle.baseIsRtl()) - info.Width;
 			}
 			break;
-		case ALIGN_LEFT:
 		case ALIGN_UNDEFINED:
 			break;
 	}
 
 	const ZLTextParagraphCursor &paragraph = info.RealStart.paragraphCursor();
-	int paragraphNumber = paragraph.index();
-	for (ZLTextWordCursor pos = info.RealStart; !pos.equalWordNumber(info.End); pos.nextWord()) {
-		const ZLTextElement &element = paragraph[pos.wordNumber()];
+	int paragraphIndex = paragraph.index();
+	for (ZLTextWordCursor pos = info.RealStart; !pos.equalElementIndex(info.End); pos.nextWord()) {
+		const ZLTextElement &element = paragraph[pos.elementIndex()];
 		ZLTextElement::Kind kind = element.kind();
-		const int x = context().x();
-		int width = myStyle.elementWidth(element, pos.charNumber());
+		int width = myStyle.elementWidth(element, pos.charIndex(), metrics);
 	
+		myStyle.applySingleControl(element);
 		switch (kind) {
 			case ZLTextElement::WORD_ELEMENT:
 			case ZLTextElement::IMAGE_ELEMENT:
 			{
-				const int height = myStyle.elementHeight(element);
+				const int height = myStyle.elementHeight(element, metrics);
 				const int descent = myStyle.elementDescent(element);
-				const int length = (kind == ZLTextElement::WORD_ELEMENT) ? ((const ZLTextWord&)element).Length - pos.charNumber() : 0;
-				myTextElementMap.push_back(
+				const int length = (kind == ZLTextElement::WORD_ELEMENT) ? ((const ZLTextWord&)element).Length - pos.charIndex() : 0;
+				addAreaToTextMap(
 					ZLTextElementArea(
-						paragraphNumber, pos.wordNumber(), pos.charNumber(), length, false,
-						changeStyle, myStyle.textStyle(), kind,
-						x, x + width - 1, y - height + 1, y + descent
+						paragraphIndex, pos.elementIndex(), pos.charIndex(), length, false,
+						myStyle.textStyle(), kind,
+						x, x + width - 1, y - height + 1, y + descent, myStyle.bidiLevel()
 					)
 				);
-				changeStyle = false;
 				wordOccured = true;
 				break;
 			}
 			case ZLTextElement::CONTROL_ELEMENT:
-				myStyle.applyControl((const ZLTextControlElement&)element);
-				changeStyle = true;
-				break;
 			case ZLTextElement::FORCED_CONTROL_ELEMENT:
-				myStyle.applyControl((const ZLTextForcedControlElement&)element);
-				changeStyle = true;
 				break;
 			case ZLTextElement::HSPACE_ELEMENT:
 			case ZLTextElement::NB_HSPACE_ELEMENT:
 				if (wordOccured && (spaceCounter > 0)) {
 					int correction = fullCorrection / spaceCounter;
-					context().moveX(context().spaceWidth() + correction);
+					x += context().spaceWidth() + correction;
 					fullCorrection -= correction;
 					wordOccured = false;
 					--spaceCounter;
@@ -285,34 +387,44 @@
 			case ZLTextElement::EMPTY_LINE_ELEMENT:
 			case ZLTextElement::FIXED_HSPACE_ELEMENT:
 				break;
+			case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+				//context().setColor(ZLColor(0, 255, 0));
+				//context().drawLine(visualX(x), y, visualX(x), y - 20);
+				break;
+			case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
+				flushRevertedElements(myStyle.bidiLevel());
+				//context().setColor(ZLColor(255, 0, 0));
+				//context().drawLine(visualX(x), y, visualX(x), y - 20);
+				break;
 		}
 
-		context().moveX(width);
+		x += width;
 	}
 	if (!endOfParagraph && (info.End.element().kind() == ZLTextElement::WORD_ELEMENT)) {
 		int start = 0;
-		if (info.End.equalWordNumber(info.RealStart)) {
-			start = info.RealStart.charNumber();
+		if (info.End.equalElementIndex(info.RealStart)) {
+			start = info.RealStart.charIndex();
 		}
-		const int len = info.End.charNumber() - start;
+		const int len = info.End.charIndex() - start;
 		if (len > 0) {
 			const ZLTextWord &word = (const ZLTextWord&)info.End.element();
-			ZLUnicodeUtil::Ucs2String ucs2string;
-			ZLUnicodeUtil::utf8ToUcs2(ucs2string, word.Data, word.Size);
-			const bool addHyphenationSign = ucs2string[start + len - 1] != '-';
-			const int x = context().x(); 
+			ZLUnicodeUtil::Ucs4String ucs4string;
+			ZLUnicodeUtil::utf8ToUcs4(ucs4string, word.Data, word.Size);
+			const bool addHyphenationSign = ucs4string[start + len - 1] != '-';
 			const int width = myStyle.wordWidth(word, start, len, addHyphenationSign);
-			const int height = myStyle.elementHeight(word);
+			const int height = myStyle.elementHeight(word, metrics);
 			const int descent = myStyle.elementDescent(word);
-			myTextElementMap.push_back(
+			addAreaToTextMap(
 				ZLTextElementArea(
-					paragraphNumber, info.End.wordNumber(), start, len, addHyphenationSign,
-					changeStyle, myStyle.textStyle(), ZLTextElement::WORD_ELEMENT,
-					x, x + width - 1, y - height + 1, y + descent
+					paragraphIndex, info.End.elementIndex(), start, len, addHyphenationSign,
+					myStyle.textStyle(), ZLTextElement::WORD_ELEMENT,
+					x, x + width - 1, y - height + 1, y + descent, word.BidiLevel
 				)
 			);
 		}
 	}
 
-	context().moveY(info.Height + info.Descent + info.VSpaceAfter);
+	for (unsigned char i = myStyle.bidiLevel(); i > myStyle.baseBidiLevel(); --i) {
+		flushRevertedElements(i - 1);
+	}
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextViewStyle.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextViewStyle.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextViewStyle.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextViewStyle.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
 #include "ZLTextStyle.h"
 #include "ZLTextElement.h"
 
-ZLTextView::ViewStyle::ViewStyle(shared_ptr<ZLPaintContext> context) : myContext(context) {
-	setTextStyle(ZLTextStyleCollection::instance().baseStylePtr());
+ZLTextView::ViewStyle::ViewStyle(shared_ptr<ZLPaintContext> context) : myContext(context), myBaseBidiLevel(0) {
+	setTextStyle(ZLTextStyleCollection::instance().baseStylePtr(), myBaseBidiLevel);
 	myWordHeight = -1;
 }
 
@@ -37,10 +37,10 @@
 }
 
 void ZLTextView::ViewStyle::reset() {
-	setTextStyle(ZLTextStyleCollection::instance().baseStylePtr());
+	setTextStyle(ZLTextStyleCollection::instance().baseStylePtr(), myBaseBidiLevel);
 }
 
-void ZLTextView::ViewStyle::setTextStyle(const ZLTextStylePtr style) {
+void ZLTextView::ViewStyle::setTextStyle(const ZLTextStylePtr style, unsigned char bidiLevel) {
 	if (myTextStyle != style) {
 		myTextStyle = style;
 		myWordHeight = -1;
@@ -48,53 +48,70 @@
 	if (!myContext.isNull()) {
 		myContext->setFont(myTextStyle->fontFamily(), myTextStyle->fontSize(), myTextStyle->bold(), myTextStyle->italic());
 	}
+	myBidiLevel = bidiLevel;
 }
 
 void ZLTextView::ViewStyle::applyControl(const ZLTextControlElement &control) {
 	if (control.isStart()) {
 		const ZLTextStyleDecoration *decoration = ZLTextStyleCollection::instance().decoration(control.textKind());
 		if (decoration != 0) {
-			setTextStyle(decoration->createDecoratedStyle(myTextStyle));
+			setTextStyle(decoration->createDecoratedStyle(myTextStyle), myBidiLevel);
 		}
 	} else {
 		if (myTextStyle->isDecorated()) {
-			setTextStyle(((ZLTextDecoratedStyle&)*myTextStyle).base());
+			setTextStyle(((ZLTextDecoratedStyle&)*myTextStyle).base(), myBidiLevel);
 		}
 	}
 }
 
-void ZLTextView::ViewStyle::applyControl(const ZLTextForcedControlElement &control) {
-	setTextStyle(new ZLTextForcedStyle(myTextStyle, control.entry()));
+void ZLTextView::ViewStyle::applyControl(const ZLTextStyleElement &control) {
+	setTextStyle(new ZLTextForcedStyle(myTextStyle, control.entry()), myBidiLevel);
 }
 
-void ZLTextView::ViewStyle::applyControls(const ZLTextWordCursor &begin, const ZLTextWordCursor &end) {
-	for (ZLTextWordCursor cursor = begin; !cursor.equalWordNumber(end); cursor.nextWord()) {
-		const ZLTextElement &element = cursor.element();
-		if (element.kind() == ZLTextElement::CONTROL_ELEMENT) {
+void ZLTextView::ViewStyle::applySingleControl(const ZLTextElement &element) {
+	switch (element.kind()) {
+		case ZLTextElement::CONTROL_ELEMENT:
 			applyControl((ZLTextControlElement&)element);
-		} else if (element.kind() == ZLTextElement::FORCED_CONTROL_ELEMENT) {
-			applyControl((ZLTextForcedControlElement&)element);
-		}
+			break;
+		case ZLTextElement::FORCED_CONTROL_ELEMENT:
+			applyControl((ZLTextStyleElement&)element);
+			break;
+		case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+			increaseBidiLevel();
+			break;
+		case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
+			decreaseBidiLevel();
+			break;
+		default:
+			break;
 	}
 }
 
-int ZLTextView::ViewStyle::elementWidth(const ZLTextElement &element, unsigned int charNumber) const {
+void ZLTextView::ViewStyle::applyControls(const ZLTextWordCursor &begin, const ZLTextWordCursor &end) {
+	for (ZLTextWordCursor cursor = begin; !cursor.equalElementIndex(end); cursor.nextWord()) {
+		applySingleControl(cursor.element());
+	}
+}
+
+int ZLTextView::ViewStyle::elementWidth(const ZLTextElement &element, unsigned int charIndex, const ZLTextStyleEntry::Metrics &metrics) const {
 	switch (element.kind()) {
 		case ZLTextElement::WORD_ELEMENT:
-			return wordWidth((const ZLTextWord&)element, charNumber, -1, false);
+			return wordWidth((const ZLTextWord&)element, charIndex, -1, false);
 		case ZLTextElement::IMAGE_ELEMENT:
-			return context().imageWidth(((const ZLTextImageElement&)element).image());
+			return context().imageWidth(*((const ZLTextImageElement&)element).image());
 		case ZLTextElement::INDENT_ELEMENT:
-			return textStyle()->firstLineIndentDelta();
+			return textStyle()->firstLineIndentDelta(metrics);
 		case ZLTextElement::HSPACE_ELEMENT:
 		case ZLTextElement::NB_HSPACE_ELEMENT:
 			return 0;
 		case ZLTextElement::BEFORE_PARAGRAPH_ELEMENT:
 		case ZLTextElement::AFTER_PARAGRAPH_ELEMENT:
 		case ZLTextElement::EMPTY_LINE_ELEMENT:
-			return context().width() + abs(textStyle()->leftIndent()) + abs(textStyle()->rightIndent()) + abs(textStyle()->firstLineIndentDelta()) + 1;
+			return metrics.FullWidth + abs(textStyle()->lineStartIndent(metrics, false)) + abs(textStyle()->lineEndIndent(metrics, false)) + abs(textStyle()->firstLineIndentDelta(metrics)) + 1;
 		case ZLTextElement::FORCED_CONTROL_ELEMENT:
 		case ZLTextElement::CONTROL_ELEMENT:
+		case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+		case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
 			return 0;
 		case ZLTextElement::FIXED_HSPACE_ELEMENT:
 			return context().spaceWidth() * ((const ZLTextFixedHSpaceElement&)element).length();
@@ -102,8 +119,9 @@
 	return 0;
 }
 
-int ZLTextView::ViewStyle::elementHeight(const ZLTextElement &element) const {
+int ZLTextView::ViewStyle::elementHeight(const ZLTextElement &element, const ZLTextStyleEntry::Metrics &metrics) const {
 	switch (element.kind()) {
+		case ZLTextElement::NB_HSPACE_ELEMENT:
 		case ZLTextElement::WORD_ELEMENT:
 			if (myWordHeight == -1) {
 				myWordHeight = context().stringHeight() * textStyle()->lineSpacePercent() / 100 + textStyle()->verticalShift();
@@ -111,20 +129,21 @@
 			return myWordHeight;
 		case ZLTextElement::IMAGE_ELEMENT:
 			return
-				context().imageHeight(((const ZLTextImageElement&)element).image()) +
+				context().imageHeight(*((const ZLTextImageElement&)element).image()) +
 				std::max(context().stringHeight() * (textStyle()->lineSpacePercent() - 100) / 100, 3);
 		case ZLTextElement::BEFORE_PARAGRAPH_ELEMENT:
-			return - textStyle()->spaceAfter();
+			return - textStyle()->spaceAfter(metrics);
 		case ZLTextElement::AFTER_PARAGRAPH_ELEMENT:
-			return - textStyle()->spaceBefore();
+			return - textStyle()->spaceBefore(metrics);
 		case ZLTextElement::EMPTY_LINE_ELEMENT:
 			return context().stringHeight();
 		case ZLTextElement::INDENT_ELEMENT:
 		case ZLTextElement::HSPACE_ELEMENT:
-		case ZLTextElement::NB_HSPACE_ELEMENT:
 		case ZLTextElement::FORCED_CONTROL_ELEMENT:
 		case ZLTextElement::CONTROL_ELEMENT:
 		case ZLTextElement::FIXED_HSPACE_ELEMENT:
+		case ZLTextElement::START_REVERSED_SEQUENCE_ELEMENT:
+		case ZLTextElement::END_REVERSED_SEQUENCE_ELEMENT:
 			return 0;
 	}
 	return 0;
@@ -146,10 +165,10 @@
 	int startPos = ZLUnicodeUtil::length(word.Data, start);
 	int endPos = (length == -1) ? word.Size : ZLUnicodeUtil::length(word.Data, start + length);
 	if (!addHyphenationSign) {
-		return context().stringWidth(word.Data + startPos, endPos - startPos);
+		return context().stringWidth(word.Data + startPos, endPos - startPos, word.BidiLevel % 2 == 1);
 	}
 	std::string substr;
 	substr.append(word.Data + startPos, endPos - startPos);
 	substr += '-';
-	return context().stringWidth(substr.data(), substr.length());
+	return context().stringWidth(substr.data(), substr.length(), word.BidiLevel % 2 == 1);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextWord.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextWord.cpp
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextWord.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextWord.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 #include "ZLTextWord.h"
 
-ZLTextWord::ZLTextWord(const char *data, unsigned short size, size_t paragraphOffset) : Data(data), Size(size), Length(ZLUnicodeUtil::utf8Length(Data, size)), ParagraphOffset(paragraphOffset), myMark(0), myWidth(-1) {
+ZLTextWord::ZLTextWord(const char *data, unsigned short size, size_t paragraphOffset, unsigned char bidiLevel) : Data(data), Size(size), Length(ZLUnicodeUtil::utf8Length(Data, size)), ParagraphOffset(paragraphOffset), BidiLevel(bidiLevel), myMark(0), myWidth(-1) {
 }
 
 ZLTextWord::~ZLTextWord() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/text/src/view/ZLTextWord.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextWord.h
--- fbreader-0.8.17/zlibrary/text/src/view/ZLTextWord.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/text/src/view/ZLTextWord.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 	};
 
 private:
-	ZLTextWord(const char *data, unsigned short size, size_t paragraphOffset);
+	ZLTextWord(const char *data, unsigned short size, size_t paragraphOffset, unsigned char bidiLevel);
 	~ZLTextWord();
 
 public:
@@ -67,6 +67,7 @@
 	/* number of characters */
 	const unsigned short Length;
 	const size_t ParagraphOffset;
+	const unsigned char BidiLevel;
 
 private:
 	Mark *myMark;
@@ -84,7 +85,7 @@
 inline ZLTextWord::Mark *ZLTextWord::mark() const { return myMark; }
 inline short ZLTextWord::width(const ZLPaintContext &context) const {
 	if (myWidth == -1) {
-		myWidth = context.stringWidth(Data, Size);
+		myWidth = context.stringWidth(Data, Size, BidiLevel % 2 == 1);
 	}
 	return myWidth;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo2.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo2.xml
--- fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo2.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo2.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keynames>
+	<key code="0xFF8D" name="&lt;Enter&gt;"/>
 	<key code="0xFF1B" name="&lt;Escape&gt;"/>
 	<key code="0xFF0D" name="&lt;ScrollKey Center&gt;"/>
 	<key code="0xFF51" name="&lt;ScrollKey Left&gt;"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo3.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo3.xml
--- fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo3.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo3.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keynames>
+	<key code="0xFF8D" name="&lt;Enter&gt;"/>
+	<key code="0xFF1B" name="&lt;Escape&gt;"/>
+	<key code="0xFF0D" name="&lt;ScrollKey Center&gt;"/>
+	<key code="0xFF51" name="&lt;ScrollKey Left&gt;"/>
+	<key code="0xFF52" name="&lt;ScrollKey Up&gt;"/>
+	<key code="0xFF53" name="&lt;ScrollKey Right&gt;"/>
+	<key code="0xFF54" name="&lt;ScrollKey Down&gt;"/>
+	<key code="0xFFC1" name="&lt;Menu&gt;"/>
+	<key code="0xFFC2" name="&lt;Home&gt;"/>
+	<key code="0xFF62" name="&lt;Power&gt;"/>
+	<key code="0xFFC3" name="&lt;FullScreen&gt;"/>
+	<key code="0xFFC4" name="&lt;ZoomKey +&gt;"/>
+	<key code="0xFFC5" name="&lt;ZoomKey -&gt;"/>
+</keynames>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo4.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo4.xml
--- fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo4.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo4.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keynames>
+	<key code="0xFF8D" name="&lt;Enter&gt;"/>
 	<key code="0xFF1B" name="&lt;Escape&gt;"/>
 	<key code="0xFF0D" name="&lt;ScrollKey Center&gt;"/>
 	<key code="0xFF51" name="&lt;ScrollKey Left&gt;"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo5.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo5.xml
--- fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo5.xml	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo5.xml	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<keynames>
+	<key code="0xFF8D" name="&lt;Enter&gt;"/>
+	<key code="0xFF1B" name="&lt;Escape&gt;"/>
+	<key code="0xFF0D" name="&lt;ScrollKey Center&gt;"/>
+	<key code="0xFF51" name="&lt;ScrollKey Left&gt;"/>
+	<key code="0xFF52" name="&lt;ScrollKey Up&gt;"/>
+	<key code="0xFF53" name="&lt;ScrollKey Right&gt;"/>
+	<key code="0xFF54" name="&lt;ScrollKey Down&gt;"/>
+	<key code="0xFFC1" name="&lt;Menu&gt;"/>
+	<key code="0xFFC2" name="&lt;Home&gt;"/>
+	<key code="0xFF62" name="&lt;Power&gt;"/>
+	<key code="0xFFC3" name="&lt;FullScreen&gt;"/>
+	<key code="0xFFC4" name="&lt;ZoomKey +&gt;"/>
+	<key code="0xFFC5" name="&lt;ZoomKey -&gt;"/>
+</keynames>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo.xml /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo.xml
--- fbreader-0.8.17/zlibrary/ui/data/keynames.maemo-maemo.xml	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/data/keynames.maemo-maemo.xml	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <keynames>
+	<key code="0xFF8D" name="&lt;Enter&gt;"/>
 	<key code="0xFF1B" name="&lt;Escape&gt;"/>
 	<key code="0xFF0D" name="&lt;ScrollKey Center&gt;"/>
 	<key code="0xFF51" name="&lt;ScrollKey Left&gt;"/>
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/Makefile /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/Makefile
--- fbreader-0.8.17/zlibrary/ui/Makefile	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/Makefile	2009-04-30 22:26:45.000000000 +0100
@@ -5,17 +5,26 @@
 VERSION = $(shell cat ../VERSION)
 
 ifeq "$(ZLSHARED)" "yes"
+  #TARGET = zlui-$(UI_TYPE).dylib
   TARGET = zlui-$(UI_TYPE).so
 else
   TARGET = libzlui-$(UI_TYPE).a
 endif
 
-SUBDIRS_ALL = src/win32/view src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/library src/win32/time src/unix/message src/win32/message
+SUBDIRS_ALL = src/win32/view src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/library src/win32/time src/unix/message src/win32/message src/nanoX/time src/nanoX/dialogs src/nanoX/optionView src/nanoX/view src/nanoX/image src/nanoX/filesystem src/nanoX/library src/nanoX/application src/cocoa/library
 QTSUBDIRS_ALL = src/qt/time src/qtopia/message src/qtopia/application src/qtopia/dialogs src/qtopia/optionView src/qtopia/view src/qt/dialogs src/qt/view src/qt/image src/qt/util src/opie/view src/opie/dialogs src/opie/application src/qt/application-desktop src/qt/application-pdaxrom src/opie/library src/qt/library src/qtopia/library src/qt/filesystem src/qt4/time src/qt4/dialogs src/qt4/view src/qt4/image src/qt4/util src/qt4/application src/qt4/library src/qt4/filesystem src/ezx/library src/ezx/application src/ezx/dialogs src/ezx/view src/ezx/optionView
-GTKSUBDIRS_ALL = src/gtk/time src/gtk/dialogs src/gtk/optionView src/gtk/view src/gtk/image src/gtk/util src/maemo/dialogs src/maemo/optionView src/maemo/view src/gpe/dialogs src/gpe/view src/gtk/application-desktop src/gtk/application-pdaxrom src/maemo/application src/gpe/application src/maemo/library src/gtk/library src/gpe/library src/gtk/filesystem src/maemo/message src/gtk/pixbuf
+GTKSUBDIRS_ALL = src/gtk/time src/gtk/dialogs src/gtk/optionView src/gtk/view src/gtk/image src/gtk/util src/maemo/dialogs src/maemo/optionView src/maemo/view src/gpe/dialogs src/gpe/view src/gtk/application-desktop src/gtk/application-pdaxrom src/maemo/application src/gpe/application src/maemo/library src/gtk/library src/gpe/library src/gtk/filesystem src/maemo/message src/maemo/network src/gtk/pixbuf
 
 SUBDIRS =
 
+ifeq "$(UI_TYPE)" "cocoa"
+	SUBDIRS = src/cocoa/library
+endif
+
+ifeq "$(UI_TYPE)" "nanoX"
+  SUBDIRS = src/nanoX/time src/nanoX/dialogs src/nanoX/optionView src/nanoX/view src/nanoX/image src/nanoX/filesystem src/nanoX/library src/unix/message src/nanoX/application
+endif
+
 ifeq "$(UI_TYPE)" "qt"
   QTSUBDIRS = src/qt/time src/qt/dialogs src/qt/view src/qt/image src/qt/util src/qt/filesystem src/qt/library src/unix/message src/qt/application-$(TARGET_ARCH)
 endif
@@ -44,10 +53,14 @@
   QTSUBDIRS = src/unix/message src/ezx/library src/qt/time src/ezx/application src/ezx/dialogs src/ezx/optionView src/ezx/view src/qt/util src/qt/image src/qt/filesystem
 endif
 
-ifeq "<$(UI_TYPE)>" "$(findstring <$(UI_TYPE)>, <maemo2> <maemo4>)"
+ifeq "<$(UI_TYPE)>" "$(findstring <$(UI_TYPE)>, <maemo2> <maemo3> <maemo4> <maemo5>)"
   GTKSUBDIRS = src/gtk/time src/maemo/dialogs src/maemo/optionView src/maemo/view src/gtk/image src/gtk/util src/maemo/application src/maemo/library src/gtk/filesystem src/maemo/message src/gtk/pixbuf
 endif
 
+ifeq "<$(UI_TYPE)>" "$(findstring <$(UI_TYPE)>, <maemo3> <maemo4> <maemo5>)"
+  GTKSUBDIRS += src/maemo/network
+endif
+
 ifeq "$(UI_TYPE)" "win32"
   SUBDIRS += src/win32/view src/win32/w32widgets src/win32/dialogs src/win32/application src/win32/image src/win32/library src/win32/time src/win32/message
 endif
@@ -76,14 +89,15 @@
 	done;
 
 $(TARGET): .objects
-	@echo -n "Creating $@ ..."
+	@echo -n 'Creating $@ ...'
 	@$(RM_QUIET) $(TARGET)
 ifeq "$(ZLSHARED)" "yes"
 	@$(LD) $(LDFLAGS) -shared -Wl,-soname,$(TARGET) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS)
+	#@$(LD) $(LDFLAGS) -dynamiclib -dylinker_install_name $(TARGET) -o $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS)) $(UILIBS) $(CORE_LIBS)
 else
 	@$(AR) $(TARGET) $(patsubst %, %/*.o, $(SUBDIRS) $(QTSUBDIRS) $(GTKSUBDIRS))
 endif
-	@echo " OK"
+	@echo ' OK'
 
 SHARE_ZLIBRARY = $(DESTDIR)$(SHAREDIR)/zlibrary
 LIB_ZLIBRARY = $(DESTDIR)$(LIBDIR)/zlibrary
@@ -123,4 +137,4 @@
 			$(MAKE) -C $$subdir -f $(MAKEFILESDIR)/gtksubdir.mk clean; \
 		fi; \
 	done;
-	@$(RM) *.so *.so.* *.a
+	@$(RM) *.so *.so.* *.dylib *.a
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/application/ZLQtApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/application/ZLQtMenuAction.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/application/ZLQtMenuAction.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/application/ZLQtMenuAction.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/application/ZLQtMenuAction.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLFullScreenDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/dialogs/ZLQtUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/optionView/ZLQtOptionViewHolder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@
 	));
 }
 
-int ZLQtPaintContext::stringWidth(const char *str, int len) const {
+int ZLQtPaintContext::stringWidth(const char *str, int len, bool) const {
 	return myPainter->fontMetrics().width(QString::fromUtf8(str, len));
 }
 
@@ -156,9 +156,22 @@
 	return myPainter->font().pointSize() + 2;
 }
 
-void ZLQtPaintContext::drawString(int x, int y, const char *str, int len) {
-	QString qStr = QString::fromUtf8(str, len);
-	myPainter->drawText(x, y, qStr);
+void ZLQtPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
+	if (rtl) {
+		static ZLUnicodeUtil::Ucs2String ucs2Str;
+		ucs2Str.clear();
+		ZLUnicodeUtil::utf8ToUcs2(ucs2Str, str, len);
+		QString qStr;
+		FriBidiChar ch;
+		for (int i = ucs2Str.size() - 1; i >= 0; --i) {
+			fribidi_get_mirror_char(ucs2Str[i], &ch);
+			qStr.append(QChar(ch));
+		}
+		myPainter->drawText(x, y, qStr);
+	} else {
+		QString qStr = QString::fromUtf8(str, len);
+		myPainter->drawText(x, y, qStr);
+	}
 }
 
 void ZLQtPaintContext::drawImage(int x, int y, const ZLImageData &image) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,11 +48,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/ezx/view/ZLQtViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/application/ZLGtkApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include "../../gtk/util/ZLGtkKeyUtil.h"
 
 static GtkLabel *gtkLabel(const std::string &name) {
-	GtkLabel *label = GTK_LABEL(gtk_label_new((gtkString(name) + ":").c_str()));
+	GtkLabel *label = GTK_LABEL(gtk_label_new(gtkString(name).c_str()));
 	gtk_label_set_justify(label, GTK_JUSTIFY_RIGHT);
 	return label;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/dialogs/ZLGtkWaitMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gpe/view/ZLGtkViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/GtkEntryParameter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/GtkEntryParameter.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/GtkEntryParameter.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/GtkEntryParameter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLGtkApplicationWindow.h"
+
+#include "../util/ZLGtkKeyUtil.h"
+#include "../util/ZLGtkSignalUtil.h"
+
+bool ZLGtkApplicationWindow::GtkEntryParameter::onKeyPressed(const std::string &keyName) {
+	static const std::string Return = "<Return>";
+	static const std::string Esc = "<Esc>";
+	static const std::string UpArrow = "<UpArrow>";
+	static const std::string DownArrow = "<DownArrow>";
+	if (keyName == Return) {
+		myWindow.application().doAction(myItem.actionId());
+		myWindow.setFocusToMainWidget();
+		return true;
+	} else if (keyName == Esc) {
+		restoreOldValue();
+		myWindow.setFocusToMainWidget();
+		return true;
+	}
+	return (keyName == UpArrow) || (keyName == DownArrow);
+}
+
+static bool onKeyPressed(GtkEntry*, GdkEventKey *event, ZLGtkApplicationWindow::GtkEntryParameter *parameter) {
+	return parameter->onKeyPressed(ZLGtkKeyUtil::keyName(event));
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::onValueChanged() {
+	GtkComboBox *comboBox = GTK_COMBO_BOX(myWidget);
+	const int index = gtk_combo_box_get_active(comboBox);
+	const int size = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(comboBox), 0);
+	if ((index >= 0) && (index < size)) {
+		const char *text = gtk_combo_box_get_active_text(comboBox);
+		if (text != 0) {
+			std::string sText = text;
+			if (!sText.empty()) {
+				myWindow.application().doAction(myItem.actionId());
+				myWindow.setFocusToMainWidget();
+			}
+		}
+	}
+}
+
+static bool onValueChanged(GtkComboBox*, ZLGtkApplicationWindow::GtkEntryParameter *parameter) {
+	parameter->onValueChanged();
+	return true;
+}
+
+ZLGtkApplicationWindow::GtkEntryParameter::GtkEntryParameter(ZLGtkApplicationWindow &window, const ZLToolbar::ParameterItem &item) : myWindow(window), myItem(item) {
+	if (item.type() == ZLToolbar::Item::COMBO_BOX) {
+		myWidget = gtk_combo_box_entry_new_text();
+		myEntry = GTK_ENTRY(GTK_BIN(myWidget)->child);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "changed", GTK_SIGNAL_FUNC(::onValueChanged), this);
+	} else {
+		myWidget = gtk_entry_new();
+		myEntry = GTK_ENTRY(myWidget);
+	}
+	gtk_entry_set_alignment(myEntry, 0.5);
+	gtk_entry_set_width_chars(myEntry, item.maxWidth());
+	gtk_entry_set_max_length(myEntry, item.maxWidth());
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "key_press_event", GTK_SIGNAL_FUNC(::onKeyPressed), this);
+}
+
+GtkToolItem *ZLGtkApplicationWindow::GtkEntryParameter::createToolItem() {
+	GtkToolItem *toolItem = gtk_tool_item_new();
+	gtk_container_add(GTK_CONTAINER(toolItem), myWidget);
+	return toolItem;
+	//return gtk_widget_tool_item_new(myWidget);
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::internalSetValue(const std::string &value) {
+	gtk_entry_set_text(myEntry, value.c_str());
+}
+
+std::string ZLGtkApplicationWindow::GtkEntryParameter::internalValue() const {
+	return gtk_entry_get_text(myEntry);
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::setValueList(const std::vector<std::string> &values) {
+	if (myItem.type() == ZLToolbar::Item::TEXT_FIELD) {
+		return;
+	}
+
+	GtkComboBox *comboBox = GTK_COMBO_BOX(myWidget);
+
+	int size = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(comboBox), 0);
+	for (; size > 0; --size) {
+		gtk_combo_box_remove_text(comboBox, 0);
+	}
+
+	for (std::vector<std::string>::const_iterator it = values.begin(); it != values.end(); ++it) {
+		gtk_combo_box_append_text(comboBox, it->c_str());
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/Toolbar.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/Toolbar.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/Toolbar.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/Toolbar.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLibrary.h>
+#include <ZLPopupData.h>
+
+#include "ZLGtkApplicationWindow.h"
+
+#include "../util/ZLGtkSignalUtil.h"
+
+static const char *menuId = "gtk-tool-button-menu-id";
+static const char *menuKey = "gtk-tool-button-menu-key";
+
+static void runMenuItem(GtkImageMenuItem *menuItem, ZLGtkApplicationWindow *data) {
+	data->onGtkButtonPress(GTK_TOOL_ITEM(gtk_object_get_data(GTK_OBJECT(menuItem), menuKey)));
+}
+
+static bool createMenuProxy(GtkToolItem *toolItem, ZLGtkApplicationWindow *data) {
+	GtkToolButton *button = GTK_TOOL_BUTTON(toolItem);
+
+	GtkWidget *menuItem = gtk_image_menu_item_new_with_label(gtk_tool_button_get_label(button));
+	gtk_image_menu_item_set_image(
+		GTK_IMAGE_MENU_ITEM(menuItem),
+		gtk_image_new_from_pixbuf(
+			gtk_image_get_pixbuf(
+				GTK_IMAGE(gtk_tool_button_get_icon_widget(button))
+			)
+		)
+	);
+	gtk_object_set_data(GTK_OBJECT(menuItem), menuKey, toolItem);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(runMenuItem), data);
+	gtk_tool_item_set_proxy_menu_item(toolItem, menuId, menuItem);
+
+	return true;
+}
+
+ZLGtkApplicationWindow::Toolbar::Toolbar(ZLGtkApplicationWindow *window) : myWindow(window) {
+	myGtkToolbar = GTK_TOOLBAR(gtk_toolbar_new());
+	gtk_toolbar_set_style(myGtkToolbar, GTK_TOOLBAR_ICONS);
+	gtk_toolbar_set_tooltips(myGtkToolbar, true);
+}
+
+GtkWidget *ZLGtkApplicationWindow::Toolbar::toolbarWidget() const {
+	return GTK_WIDGET(myGtkToolbar);
+}
+
+ZLToolbar::AbstractButtonItem &ZLGtkApplicationWindow::Toolbar::buttonItemByWidget(GtkToolItem *gtkButton) {
+	return (ZLToolbar::AbstractButtonItem&)*myGtkToAbstract[gtkButton];
+}
+
+void ZLGtkApplicationWindow::Toolbar::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	GtkToggleToolButton *gtkButton =
+		GTK_TOGGLE_TOOL_BUTTON(myAbstractToGtk[&(ZLToolbar::Item&)button]);
+	const bool isPressed = button.isPressed();
+	if (gtk_toggle_tool_button_get_active(gtkButton) != isPressed) {
+		gtk_toggle_tool_button_set_active(gtkButton, isPressed);
+	}
+}
+
+static void onButtonClicked(GtkWidget *button, gpointer data) {
+	((ZLGtkApplicationWindow*)data)->onGtkButtonPress(GTK_TOOL_ITEM(button));
+}
+
+GtkToolItem *ZLGtkApplicationWindow::Toolbar::createGtkToolButton(const ZLToolbar::AbstractButtonItem &button) {
+	GtkToolItem *gtkItem = 0;
+	static std::string imagePrefix =
+		ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
+	GtkWidget *image = gtk_image_new_from_file(
+		(imagePrefix + button.iconName() + ".png").c_str()
+	);
+
+	switch (button.type()) {
+		case ZLToolbar::Item::PLAIN_BUTTON:
+			gtkItem = gtk_tool_button_new(image, button.tooltip().c_str());
+			break;
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+			gtkItem = gtk_toggle_tool_button_new();
+			gtk_tool_button_set_label(GTK_TOOL_BUTTON(gtkItem), button.tooltip().c_str());
+			gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(gtkItem), image);
+			break;
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			gtkItem = gtk_menu_tool_button_new(image, button.tooltip().c_str());
+			const ZLToolbar::MenuButtonItem &menuButton =
+				(const ZLToolbar::MenuButtonItem&)button;
+			shared_ptr<ZLPopupData> popupData = menuButton.popupData();
+			myPopupIdMap[gtkItem] =
+				popupData.isNull() ? (size_t)-1 : (popupData->id() - 1);
+			gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(gtkItem), gtk_menu_new());
+			gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(gtkItem), myGtkToolbar->tooltips, menuButton.popupTooltip().c_str(), 0);
+			break;
+		}
+		default:
+			break;
+	}
+
+	gtk_tool_item_set_tooltip(gtkItem, myGtkToolbar->tooltips, button.tooltip().c_str(), 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(gtkItem), "create_menu_proxy", GTK_SIGNAL_FUNC(createMenuProxy), myWindow);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(gtkItem), "clicked", GTK_SIGNAL_FUNC(onButtonClicked), myWindow);
+
+	return gtkItem;
+}
+
+void ZLGtkApplicationWindow::Toolbar::addToolbarItem(ZLToolbar::ItemPtr item) {
+	GtkToolItem *gtkItem = 0;
+
+	switch (item->type()) {
+		case ZLToolbar::Item::TEXT_FIELD:
+		case ZLToolbar::Item::COMBO_BOX:
+			{
+				const ZLToolbar::ParameterItem &parameterItem = (const ZLToolbar::ParameterItem&)*item;
+				GtkEntryParameter *parameter =
+					new GtkEntryParameter(*myWindow, parameterItem);
+				myWindow->addVisualParameter(parameterItem.parameterId(), parameter);
+				gtkItem = parameter->createToolItem();
+				gtk_tool_item_set_tooltip(gtkItem, myGtkToolbar->tooltips, parameterItem.tooltip().c_str(), 0);
+			}
+			break;
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+			gtkItem = createGtkToolButton((const ZLToolbar::AbstractButtonItem&)*item);
+			break;
+		case ZLToolbar::Item::SEPARATOR:
+			gtkItem = gtk_separator_tool_item_new();
+			break;
+	}
+	if (gtkItem != 0) {
+		gtk_toolbar_insert(myGtkToolbar, gtkItem, -1);
+		myAbstractToGtk[&*item] = gtkItem;
+		myGtkToAbstract[gtkItem] = item;
+		gtk_widget_show_all(GTK_WIDGET(gtkItem));
+	}
+}
+
+static bool itemActivated(GtkWidget *menuItem, gpointer data) {
+	GtkMenu *menu = GTK_MENU(gtk_widget_get_parent(menuItem));
+	GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+	int index = g_list_index(children, (gconstpointer)menuItem);
+	((ZLPopupData*)data)->run(index);
+	return true;
+}
+
+void ZLGtkApplicationWindow::Toolbar::updatePopupData(GtkMenuToolButton *button, shared_ptr<ZLPopupData> data) {
+	if (data.isNull()) {
+		return;
+	}
+
+	const size_t id = data->id();
+	if (id == myPopupIdMap[GTK_TOOL_ITEM(button)]) {
+		return;
+	}
+	myPopupIdMap[GTK_TOOL_ITEM(button)] = id;
+
+	GtkMenu *menu = GTK_MENU(gtk_menu_tool_button_get_menu(button));
+	GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+	if (children != 0) {
+		for (GList *ptr =  g_list_last(children); ; ptr = g_list_previous(ptr)) {
+			gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(ptr->data));
+			if (ptr == children) {
+				break;
+			}
+		}
+	}
+
+	const size_t count = data->count();
+	for (size_t i = 0; i < count; ++i) {
+		GtkWidget *item = gtk_menu_item_new_with_label(data->text(i).c_str());
+		gtk_widget_show_all(item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(item), "activate", GTK_SIGNAL_FUNC(itemActivated), &*data);
+	}
+}
+
+void ZLGtkApplicationWindow::Toolbar::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	std::map<const ZLToolbar::Item*,GtkToolItem*>::const_iterator it = myAbstractToGtk.find(&*item);
+	if (it == myAbstractToGtk.end()) {
+		return;
+	}
+
+	GtkToolItem *gtkItem = it->second;
+	if (visible) {
+		gtk_widget_show(GTK_WIDGET(gtkItem));
+	} else {
+		gtk_widget_hide(GTK_WIDGET(gtkItem));
+	}
+	/*
+	 * Not sure, but looks like gtk_widget_set_sensitive(WIDGET, false)
+	 * does something strange if WIDGET is already insensitive.
+	 */
+	bool alreadyEnabled = GTK_WIDGET_STATE(GTK_WIDGET(gtkItem)) != GTK_STATE_INSENSITIVE;
+	if (enabled != alreadyEnabled) {
+		gtk_widget_set_sensitive(GTK_WIDGET(gtkItem), enabled);
+	}
+
+	if (item->type() == ZLToolbar::Item::MENU_BUTTON) {
+		updatePopupData(
+			GTK_MENU_TOOL_BUTTON(gtkItem),
+			((ZLToolbar::MenuButtonItem&)*item).popupData()
+		);
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,6 @@
  * 02110-1301, USA.
  */
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
 #include <ZLibrary.h>
 
 #include "ZLGtkApplicationWindow.h"
@@ -28,60 +25,37 @@
 #include "../util/ZLGtkSignalUtil.h"
 #include "../dialogs/ZLGtkDialogManager.h"
 #include "../view/ZLGtkViewWidget.h"
-#include "../../../../core/src/dialogs/ZLOptionView.h"
 
 void ZLGtkDialogManager::createApplicationWindow(ZLApplication *application) const {
 	myWindow = (new ZLGtkApplicationWindow(application))->getMainWindow();
 }
 
-static bool applicationQuit(GtkWidget*, GdkEvent*, gpointer data) {
-	((ZLGtkApplicationWindow*)data)->application().closeView();
+static bool applicationQuit(GtkWidget*, GdkEvent*, ZLGtkApplicationWindow *data) {
+	data->application().closeView();
 	return true;
 }
 
-static void onButtonClicked(GtkWidget *button, gpointer data) {
-	((ZLGtkApplicationWindow*)data)->onGtkButtonPress(button);
-}
-
-static bool handleKeyEvent(GtkWidget*, GdkEventKey *event, gpointer data) {
-	return ((ZLGtkApplicationWindow*)data)->handleKeyEventSlot(event);
-}
-
-static void handleScrollEvent(GtkWidget*, GdkEventScroll *event, gpointer data) {
-	((ZLGtkApplicationWindow*)data)->handleScrollEventSlot(event);
-}
-
-static const std::string OPTIONS = "Options";
-
-ZLGtkApplicationWindow::Toolbar::Toolbar(ZLGtkApplicationWindow *window) : myWindow(window), myWidgetCounter(0) {
-	myGtkToolbar = GTK_TOOLBAR(gtk_toolbar_new());
-	gtk_toolbar_set_style(myGtkToolbar, GTK_TOOLBAR_ICONS);
-}
-
-GtkWidget *ZLGtkApplicationWindow::Toolbar::toolbarWidget() const {
-	return GTK_WIDGET(myGtkToolbar);
-}
-
-ZLApplication::Toolbar::ButtonItem &ZLGtkApplicationWindow::Toolbar::buttonItemByWidget(GtkWidget *gtkButton) {
-	return (ZLApplication::Toolbar::ButtonItem&)*myWidgetToButton[gtkButton];
+static bool presentHandler(GtkWidget*, GdkEvent*, GtkWindow *data) {
+	gtk_window_present(data);
+	return false;
 }
 
-void ZLGtkApplicationWindow::Toolbar::attachWidget(ZLOptionView&, GtkWidget *widget) {
-	gtk_toolbar_append_widget(myGtkToolbar, widget, 0, 0);
-	++myWidgetCounter;
+static bool handleKeyEvent(GtkWidget*, GdkEventKey *event, ZLGtkApplicationWindow *data) {
+	return data->handleKeyEventSlot(event);
 }
 
-void ZLGtkApplicationWindow::Toolbar::attachWidgets(ZLOptionView &view, GtkWidget *widget0, GtkWidget *widget1) {
-	attachWidget(view, widget0);
-	attachWidget(view, widget1);
+static void handleScrollEvent(GtkWidget*, GdkEventScroll *event, ZLGtkApplicationWindow *data) {
+	data->handleScrollEventSlot(event);
 }
 
 ZLGtkApplicationWindow::ZLGtkApplicationWindow(ZLApplication *application) :
 	ZLDesktopApplicationWindow(application),
+	myViewWidget(0),
 	myHyperlinkCursor(0),
 	myHyperlinkCursorIsUsed(false),
-	myToolbar(this) {
-
+	myWindowToolbar(this),
+	myFullscreenToolbar(this),
+	myHandleBox(0) {
 	myMainWindow = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
 	const std::string iconFileName = ZLibrary::ImageDirectory() + ZLibrary::FileNameDelimiter + ZLibrary::ApplicationName() + ".png";
 	gtk_window_set_icon(myMainWindow, gdk_pixbuf_new_from_file(iconFileName.c_str(), 0));
@@ -90,7 +64,15 @@
 	myVBox = gtk_vbox_new(false, 0);
 	gtk_container_add(GTK_CONTAINER(myMainWindow), myVBox);
 
-	gtk_box_pack_start(GTK_BOX(myVBox), myToolbar.toolbarWidget(), false, false, 0);
+	if (hasFullscreenToolbar()) {
+		myHandleBox = GTK_HANDLE_BOX(gtk_handle_box_new());
+		gtk_toolbar_set_show_arrow(GTK_TOOLBAR(myFullscreenToolbar.toolbarWidget()), false);
+		gtk_container_add(GTK_CONTAINER(myHandleBox), myFullscreenToolbar.toolbarWidget());
+		gtk_box_pack_start(GTK_BOX(myVBox), GTK_WIDGET(myHandleBox), false, false, 0);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myHandleBox), "event", GTK_SIGNAL_FUNC(presentHandler), myMainWindow);
+	}
+
+	gtk_box_pack_start(GTK_BOX(myVBox), myWindowToolbar.toolbarWidget(), false, false, 0);
 
 	gtk_window_resize(myMainWindow, myWidthOption.value(), myHeightOption.value());
 	gtk_window_move(myMainWindow, myXOption.value(), myYOption.value());
@@ -134,6 +116,19 @@
 	}
 }
 
+void ZLGtkApplicationWindow::refresh() {
+	ZLDesktopApplicationWindow::refresh();
+	ToolbarType type =
+		isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR;
+	gtk_widget_queue_resize(toolbar(type).toolbarWidget());
+}
+
+void ZLGtkApplicationWindow::processAllEvents() {
+	while (gtk_events_pending()) {
+		gtk_main_iteration();
+	}
+}
+
 bool ZLGtkApplicationWindow::handleKeyEventSlot(GdkEventKey *event) {
 	GtkWidget *widget = gtk_window_get_focus(myMainWindow);
 	if ((widget == 0) || !GTK_WIDGET_CAN_FOCUS(widget) || GTK_IS_DRAWING_AREA(widget)) {
@@ -156,33 +151,50 @@
 	}
 }
 
-void ZLGtkApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	myToolbar.setToggleButtonState(button);
+void ZLGtkApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	toolbar(type(button)).setToggleButtonState(button);
 }
 
-void ZLGtkApplicationWindow::Toolbar::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	GtkToggleButton *gtkButton = GTK_TOGGLE_BUTTON(myButtonToWidget[&(ZLApplication::Toolbar::Item&)button]);
-	const bool isPressed = button.isPressed();
-	if (gtk_toggle_button_get_active(gtkButton) != isPressed) {
-		gtk_toggle_button_set_active(gtkButton, isPressed);
+void ZLGtkApplicationWindow::onGtkButtonPress(GtkToolItem *gtkButton) {
+	ToolbarType type =
+		isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR;
+	onButtonPress(toolbar(type).buttonItemByWidget(gtkButton));
+	if (isFullscreen()) {
+		gtk_window_present(myMainWindow);
 	}
 }
 
-void ZLGtkApplicationWindow::onGtkButtonPress(GtkWidget *gtkButton) {
-	onButtonPress(myToolbar.buttonItemByWidget(gtkButton));
-}
-
 void ZLGtkApplicationWindow::setFullscreen(bool fullscreen) {
 	if (fullscreen == isFullscreen()) {
 		return;
 	}
 
+	GdkWindowState state = gdk_window_get_state(GTK_WIDGET(myMainWindow)->window);
 	if (fullscreen) {
+		if ((state & GDK_WINDOW_STATE_MAXIMIZED) == 0) {
+			int x, y, width, height;
+			gtk_window_get_position(myMainWindow, &x, &y);
+			gtk_window_get_size(myMainWindow, &width, &height);
+			myXOption.setValue(x);
+			myYOption.setValue(y);
+			myWidthOption.setValue(width);
+			myHeightOption.setValue(height);
+		}
 		gtk_window_fullscreen(myMainWindow);
-		gtk_widget_hide(myToolbar.toolbarWidget());
+		gtk_widget_hide(myWindowToolbar.toolbarWidget());
+		if (myHandleBox != 0) {
+			gtk_widget_show_all(GTK_WIDGET(myHandleBox));
+		}
 	} else {
 		gtk_window_unfullscreen(myMainWindow);
-		gtk_widget_show(myToolbar.toolbarWidget());
+		if (myHandleBox != 0) {
+			gtk_widget_hide(GTK_WIDGET(myHandleBox));
+		}
+		gtk_widget_show(myWindowToolbar.toolbarWidget());
+		if ((state & GDK_WINDOW_STATE_MAXIMIZED) == 0) {
+			gtk_window_resize(myMainWindow, myWidthOption.value(), myHeightOption.value());
+			gtk_window_move(myMainWindow, myXOption.value(), myYOption.value());
+		}
 	}
 
 	gtk_widget_queue_resize(GTK_WIDGET(myMainWindow));
@@ -194,109 +206,23 @@
 		GDK_WINDOW_STATE_FULLSCREEN;
 }
 
-void ZLGtkApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	myToolbar.addToolbarItem(item);
+void ZLGtkApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr item) {
+	toolbar(type(*item)).addToolbarItem(item);
 }
 
-void ZLGtkApplicationWindow::Toolbar::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	switch (item->type()) {
-		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
-			{
-				shared_ptr<ZLOptionEntry> entry = ((const ZLApplication::Toolbar::OptionEntryItem&)*item).entry();
-				ZLOptionView *view = createViewByEntry("", "", entry);
-				if (view != 0) {
-					myViews.push_back(view);
-					entry->setVisible(true);
-				}
-			}
-			break;
-		case ZLApplication::Toolbar::Item::BUTTON:
-			{
-				const ZLApplication::Toolbar::ButtonItem &buttonItem = (const ZLApplication::Toolbar::ButtonItem&)*item;
-				static std::string imagePrefix = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
-				GtkWidget *image = gtk_image_new_from_file((imagePrefix + buttonItem.iconName() + ".png").c_str());
-				GtkWidget *button = buttonItem.isToggleButton() ? gtk_toggle_button_new() : gtk_button_new();
-				gtk_button_set_relief((GtkButton*)button, GTK_RELIEF_NONE);
-				GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
-				gtk_container_add(GTK_CONTAINER(button), image);
-				gtk_toolbar_append_widget(myGtkToolbar, button, buttonItem.tooltip().c_str(), 0);
-				ZLGtkSignalUtil::connectSignal(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(onButtonClicked), myWindow);
-				myButtonToWidget[&*item] = button;
-				myWidgetToButton[button] = item;
-				gtk_widget_show_all(button);
-			}
-			break;
-		case ZLApplication::Toolbar::Item::SEPARATOR:
-			mySeparatorMap[item] = myButtonToWidget.size() + myWidgetCounter;
-			mySeparatorVisibilityMap.push_back(std::pair<ZLApplication::Toolbar::ItemPtr,bool>(item, false));
-			break;
-	}
-}
-
-void ZLGtkApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	myToolbar.setToolbarItemState(item, visible, enabled);
-}
-
-void ZLGtkApplicationWindow::Toolbar::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	switch (item->type()) {
-		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
-			break;
-		case ZLApplication::Toolbar::Item::BUTTON:
-			{
-				std::map<const ZLApplication::Toolbar::Item*,GtkWidget*>::const_iterator it = myButtonToWidget.find(&*item);
-				if (it != myButtonToWidget.end()) {
-					GtkWidget *gtkButton = it->second;
-					if (visible) {
-						gtk_widget_show(gtkButton);
-					} else {
-						gtk_widget_hide(gtkButton);
-					}
-					/*
-					 * Not sure, but looks like gtk_widget_set_sensitive(WIDGET, false)
-					 * does something strange if WIDGET is already insensitive.
-					 */
-					bool alreadyEnabled = GTK_WIDGET_STATE(gtkButton) != GTK_STATE_INSENSITIVE;
-					if (enabled != alreadyEnabled) {
-						gtk_widget_set_sensitive(gtkButton, enabled);
-					}
-				}
-			}
-			break;
-		case ZLApplication::Toolbar::Item::SEPARATOR:
-			{
-				std::map<const shared_ptr<ZLApplication::Toolbar::Item>,int>::iterator it = mySeparatorMap.find(item);
-				if (it != mySeparatorMap.end()) {
-					int index = it->second;
-					std::vector<std::pair<ZLApplication::Toolbar::ItemPtr,bool> >::iterator jt;
-					for (jt = mySeparatorVisibilityMap.begin(); jt != mySeparatorVisibilityMap.end(); ++jt) {
-						if (jt->first == it->first) {
-							break;
-						}
-						if (jt->second) {
-							++index;
-						}
-					}
-					if (visible) {
-						if (!jt->second) {
-							gtk_toolbar_insert_space(myGtkToolbar, index);
-						}
-					} else {
-						if (jt->second) {
-							gtk_toolbar_remove_space(myGtkToolbar, index);
-						}
-					}
-					jt->second = visible;
-				}
-			}
-			break;
-	}
+void ZLGtkApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	toolbar(type(*item)).setToolbarItemState(item, visible, enabled);
 }
 
 ZLViewWidget *ZLGtkApplicationWindow::createViewWidget() {
-	ZLGtkViewWidget *viewWidget = new ZLGtkViewWidget(&application(), (ZLViewWidget::Angle)application().AngleStateOption.value());
-	gtk_container_add(GTK_CONTAINER(myVBox), viewWidget->area());
-	gtk_widget_show_all(myVBox);
-	return viewWidget;
+	myViewWidget = new ZLGtkViewWidget(&application(), (ZLView::Angle)application().AngleStateOption.value());
+	gtk_container_add(GTK_CONTAINER(myVBox), myViewWidget->areaWithScrollbars());
+	gtk_widget_show(myVBox);
+	gtk_widget_show(myWindowToolbar.toolbarWidget());
+	if (myHandleBox != 0) {
+		gtk_widget_hide(GTK_WIDGET(myHandleBox));
+	}
+	return myViewWidget;
 }
 
 void ZLGtkApplicationWindow::close() {
@@ -317,8 +243,12 @@
 		if (myHyperlinkCursor == 0) {
 			myHyperlinkCursor = gdk_cursor_new(GDK_HAND1);
 		}
-		gdk_window_set_cursor(GTK_WIDGET(myMainWindow)->window, myHyperlinkCursor);
+		gdk_window_set_cursor(myViewWidget->area()->window, myHyperlinkCursor);
 	} else {
-		gdk_window_set_cursor(GTK_WIDGET(myMainWindow)->window, 0);
+		gdk_window_set_cursor(myViewWidget->area()->window, 0);
 	}
 }
+
+void ZLGtkApplicationWindow::setFocusToMainWidget() {
+	gtk_window_set_focus(myMainWindow, myViewWidget->area());
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-desktop/ZLGtkApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,11 +26,15 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtktoolbar.h>
+#include <gtk/gtktoolitem.h>
+#include <gtk/gtkmenutoolbutton.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkhandlebox.h>
 
 #include "../../../../core/src/desktop/application/ZLDesktopApplicationWindow.h"
-#include "../optionView/ZLGtkOptionViewHolder.h"
+#include "../../../../core/src/application/ZLToolbar.h"
 
-class ZLOptionView;
+class ZLGtkViewWidget;
 
 class ZLGtkApplicationWindow : public ZLDesktopApplicationWindow { 
 
@@ -40,8 +44,10 @@
 
 private:
 	ZLViewWidget *createViewWidget();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void init();
+	void refresh();
+	void processAllEvents();
 	void close();
 
 	void grabAllKeys(bool grab);
@@ -53,52 +59,81 @@
 	bool isFullscreen() const;
 	void setFullscreen(bool fullscreen);
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
 
 public:
 	bool handleKeyEventSlot(GdkEventKey *event);
 	void handleScrollEventSlot(GdkEventScroll *event);
-	void onGtkButtonPress(GtkWidget *gtkButton);
+	void onGtkButtonPress(GtkToolItem *gtkButton);
 
 	GtkWindow *getMainWindow() { return myMainWindow; }
+	void setFocusToMainWidget();
+
+public:
+	class GtkEntryParameter : public VisualParameter {
+
+	public:
+		GtkEntryParameter(ZLGtkApplicationWindow &window, const ZLToolbar::ParameterItem &item);
+		bool onKeyPressed(const std::string &keyName);
+		void onValueChanged();
+		GtkToolItem *createToolItem();
+
+	private:
+		std::string internalValue() const;
+		void internalSetValue(const std::string &value);
+		void setValueList(const std::vector<std::string> &values);
+
+	private:
+		ZLGtkApplicationWindow &myWindow;
+		const ZLToolbar::ParameterItem &myItem;
+		GtkWidget *myWidget;
+		GtkEntry *myEntry;
+	};
 
 private:
 	GtkWindow *myMainWindow;
+	ZLGtkViewWidget *myViewWidget;
 
 	GtkWidget *myVBox;
 
 	GdkCursor *myHyperlinkCursor;
 	bool myHyperlinkCursorIsUsed;
 
-	class Toolbar : public ZLGtkOptionViewHolder {
+	class Toolbar {
 
 	public:
 		Toolbar(ZLGtkApplicationWindow *window);
 
 		GtkWidget *toolbarWidget() const;
 
-		void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
-		void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-		void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
-		ZLApplication::Toolbar::ButtonItem &buttonItemByWidget(GtkWidget *gtkButton);
+		void addToolbarItem(ZLToolbar::ItemPtr item);
+		void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+		void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
+		ZLToolbar::AbstractButtonItem &buttonItemByWidget(GtkToolItem *gtkButton);
 
 	private:
-		void attachWidget(ZLOptionView &view, GtkWidget *widget);
-		void attachWidgets(ZLOptionView &view, GtkWidget *widget0, GtkWidget *widget1);
+		GtkToolItem *createGtkToolButton(const ZLToolbar::AbstractButtonItem &button);
+		void updatePopupData(GtkMenuToolButton *button, shared_ptr<ZLPopupData> data);
 
 	private:
 		ZLGtkApplicationWindow *myWindow;
 		GtkToolbar *myGtkToolbar;
-		std::map<const ZLApplication::Toolbar::Item*,GtkWidget*> myButtonToWidget;
-		std::map<GtkWidget*,ZLApplication::Toolbar::ItemPtr> myWidgetToButton;
-		std::map<ZLApplication::Toolbar::ItemPtr,int> mySeparatorMap;
-		std::vector<std::pair<ZLApplication::Toolbar::ItemPtr,bool> > mySeparatorVisibilityMap;
-		std::vector<shared_ptr<ZLOptionView> > myViews;
-		int myWidgetCounter;
+		std::map<const ZLToolbar::Item*,GtkToolItem*> myAbstractToGtk;
+		std::map<GtkToolItem*,ZLToolbar::ItemPtr> myGtkToAbstract;
+		std::map<GtkToolItem*,size_t> myPopupIdMap;
+
+	friend class ZLGtkApplicationWindow;
 	};
 
-	Toolbar myToolbar;
+	Toolbar myWindowToolbar;
+	Toolbar myFullscreenToolbar;
+
+	Toolbar &toolbar(ToolbarType type) {
+		return (type == WINDOW_TOOLBAR) ? myWindowToolbar : myFullscreenToolbar;
+	}
+
+	GtkHandleBox *myHandleBox;
 };
 
 #endif /* __ZLGTKAPPLICATIONWINDOW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pdaxrom/ZLGtkApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/GtkEntryParameter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/GtkEntryParameter.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/GtkEntryParameter.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/GtkEntryParameter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLGtkApplicationWindow.h"
+
+#include "../util/ZLGtkKeyUtil.h"
+#include "../util/ZLGtkSignalUtil.h"
+
+bool ZLGtkApplicationWindow::GtkEntryParameter::onKeyPressed(const std::string &keyName) {
+	static const std::string Return = "<Return>";
+	static const std::string Esc = "<Esc>";
+	static const std::string UpArrow = "<UpArrow>";
+	static const std::string DownArrow = "<DownArrow>";
+	if (keyName == Return) {
+		myWindow.application().doAction(myItem.actionId());
+		myWindow.setFocusToMainWidget();
+		return true;
+	} else if (keyName == Esc) {
+		restoreOldValue();
+		myWindow.setFocusToMainWidget();
+		return true;
+	}
+	return (keyName == UpArrow) || (keyName == DownArrow);
+}
+
+static bool onKeyPressed(GtkEntry*, GdkEventKey *event, ZLGtkApplicationWindow::GtkEntryParameter *parameter) {
+	return parameter->onKeyPressed(ZLGtkKeyUtil::keyName(event));
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::onValueChanged() {
+	GtkComboBox *comboBox = GTK_COMBO_BOX(myWidget);
+	const int index = gtk_combo_box_get_active(comboBox);
+	const int size = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(comboBox), 0);
+	if ((index >= 0) && (index < size)) {
+		const char *text = gtk_combo_box_get_active_text(comboBox);
+		if (text != 0) {
+			std::string sText = text;
+			if (!sText.empty()) {
+				myWindow.application().doAction(myItem.actionId());
+				myWindow.setFocusToMainWidget();
+			}
+		}
+	}
+}
+
+static bool onValueChanged(GtkComboBox*, ZLGtkApplicationWindow::GtkEntryParameter *parameter) {
+	parameter->onValueChanged();
+	return true;
+}
+
+ZLGtkApplicationWindow::GtkEntryParameter::GtkEntryParameter(ZLGtkApplicationWindow &window, const ZLToolbar::ParameterItem &item) : myWindow(window), myItem(item) {
+	if (item.type() == ZLToolbar::Item::COMBO_BOX) {
+		myWidget = gtk_combo_box_entry_new_text();
+		myEntry = GTK_ENTRY(GTK_BIN(myWidget)->child);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "changed", GTK_SIGNAL_FUNC(::onValueChanged), this);
+	} else {
+		myWidget = gtk_entry_new();
+		myEntry = GTK_ENTRY(myWidget);
+	}
+	gtk_entry_set_alignment(myEntry, 0.5);
+	gtk_entry_set_width_chars(myEntry, item.maxWidth());
+	gtk_entry_set_max_length(myEntry, item.maxWidth());
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "key_press_event", GTK_SIGNAL_FUNC(::onKeyPressed), this);
+}
+
+GtkToolItem *ZLGtkApplicationWindow::GtkEntryParameter::createToolItem() {
+	GtkToolItem *toolItem = gtk_tool_item_new();
+	gtk_container_add(GTK_CONTAINER(toolItem), myWidget);
+	return toolItem;
+	//return gtk_widget_tool_item_new(myWidget);
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::internalSetValue(const std::string &value) {
+	gtk_entry_set_text(myEntry, value.c_str());
+}
+
+std::string ZLGtkApplicationWindow::GtkEntryParameter::internalValue() const {
+	return gtk_entry_get_text(myEntry);
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::setValueList(const std::vector<std::string> &values) {
+	if (myItem.type() == ZLToolbar::Item::TEXT_FIELD) {
+		return;
+	}
+
+	GtkComboBox *comboBox = GTK_COMBO_BOX(myWidget);
+
+	int size = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(comboBox), 0);
+	for (; size > 0; --size) {
+		gtk_combo_box_remove_text(comboBox, 0);
+	}
+
+	for (std::vector<std::string>::const_iterator it = values.begin(); it != values.end(); ++it) {
+		gtk_combo_box_append_text(comboBox, it->c_str());
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/Toolbar.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/Toolbar.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/Toolbar.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/Toolbar.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <ZLibrary.h>
+#include <ZLPopupData.h>
+
+#include "ZLGtkApplicationWindow.h"
+
+#include "../util/ZLGtkSignalUtil.h"
+
+static const char *menuId = "gtk-tool-button-menu-id";
+static const char *menuKey = "gtk-tool-button-menu-key";
+
+static void runMenuItem(GtkImageMenuItem *menuItem, ZLGtkApplicationWindow *data) {
+	data->onGtkButtonPress(GTK_TOOL_ITEM(gtk_object_get_data(GTK_OBJECT(menuItem), menuKey)));
+}
+
+static bool createMenuProxy(GtkToolItem *toolItem, ZLGtkApplicationWindow *data) {
+	GtkToolButton *button = GTK_TOOL_BUTTON(toolItem);
+
+	GtkWidget *menuItem = gtk_image_menu_item_new_with_label(gtk_tool_button_get_label(button));
+	gtk_image_menu_item_set_image(
+		GTK_IMAGE_MENU_ITEM(menuItem),
+		gtk_image_new_from_pixbuf(
+			gtk_image_get_pixbuf(
+				GTK_IMAGE(gtk_tool_button_get_icon_widget(button))
+			)
+		)
+	);
+	gtk_object_set_data(GTK_OBJECT(menuItem), menuKey, toolItem);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(menuItem), "activate", GTK_SIGNAL_FUNC(runMenuItem), data);
+	gtk_tool_item_set_proxy_menu_item(toolItem, menuId, menuItem);
+
+	return true;
+}
+
+ZLGtkApplicationWindow::Toolbar::Toolbar(ZLGtkApplicationWindow *window) : myWindow(window) {
+	myGtkToolbar = GTK_TOOLBAR(gtk_toolbar_new());
+	gtk_toolbar_set_style(myGtkToolbar, GTK_TOOLBAR_ICONS);
+	gtk_toolbar_set_tooltips(myGtkToolbar, true);
+}
+
+GtkWidget *ZLGtkApplicationWindow::Toolbar::toolbarWidget() const {
+	return GTK_WIDGET(myGtkToolbar);
+}
+
+ZLToolbar::AbstractButtonItem &ZLGtkApplicationWindow::Toolbar::buttonItemByWidget(GtkToolItem *gtkButton) {
+	return (ZLToolbar::AbstractButtonItem&)*myGtkToAbstract[gtkButton];
+}
+
+void ZLGtkApplicationWindow::Toolbar::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	GtkToggleToolButton *gtkButton =
+		GTK_TOGGLE_TOOL_BUTTON(myAbstractToGtk[&(ZLToolbar::Item&)button]);
+	const bool isPressed = button.isPressed();
+	if (gtk_toggle_tool_button_get_active(gtkButton) != isPressed) {
+		gtk_toggle_tool_button_set_active(gtkButton, isPressed);
+	}
+}
+
+static void onButtonClicked(GtkWidget *button, gpointer data) {
+	((ZLGtkApplicationWindow*)data)->onGtkButtonPress(GTK_TOOL_ITEM(button));
+}
+
+GtkToolItem *ZLGtkApplicationWindow::Toolbar::createGtkToolButton(const ZLToolbar::AbstractButtonItem &button) {
+	GtkToolItem *gtkItem = 0;
+	static std::string imagePrefix =
+		ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
+	GtkWidget *image = gtk_image_new_from_file(
+		(imagePrefix + button.iconName() + ".png").c_str()
+	);
+
+	switch (button.type()) {
+		case ZLToolbar::Item::PLAIN_BUTTON:
+			gtkItem = gtk_tool_button_new(image, button.tooltip().c_str());
+			break;
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+			gtkItem = gtk_toggle_tool_button_new();
+			gtk_tool_button_set_label(GTK_TOOL_BUTTON(gtkItem), button.tooltip().c_str());
+			gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(gtkItem), image);
+			break;
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			gtkItem = gtk_menu_tool_button_new(image, button.tooltip().c_str());
+			const ZLToolbar::MenuButtonItem &menuButton =
+				(const ZLToolbar::MenuButtonItem&)button;
+			shared_ptr<ZLPopupData> popupData = menuButton.popupData();
+			myPopupIdMap[gtkItem] =
+				popupData.isNull() ? (size_t)-1 : (popupData->id() - 1);
+			gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(gtkItem), gtk_menu_new());
+			gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(gtkItem), myGtkToolbar->tooltips, menuButton.popupTooltip().c_str(), 0);
+			break;
+		}
+		default:
+			break;
+	}
+
+	gtk_tool_item_set_tooltip(gtkItem, myGtkToolbar->tooltips, button.tooltip().c_str(), 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(gtkItem), "create_menu_proxy", GTK_SIGNAL_FUNC(createMenuProxy), myWindow);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(gtkItem), "clicked", GTK_SIGNAL_FUNC(onButtonClicked), myWindow);
+
+	return gtkItem;
+}
+
+void ZLGtkApplicationWindow::Toolbar::addToolbarItem(ZLToolbar::ItemPtr item) {
+	GtkToolItem *gtkItem = 0;
+
+	switch (item->type()) {
+		case ZLToolbar::Item::TEXT_FIELD:
+		case ZLToolbar::Item::COMBO_BOX:
+			{
+				const ZLToolbar::ParameterItem &parameterItem = (const ZLToolbar::ParameterItem&)*item;
+				GtkEntryParameter *parameter =
+					new GtkEntryParameter(*myWindow, parameterItem);
+				myWindow->addVisualParameter(parameterItem.parameterId(), parameter);
+				gtkItem = parameter->createToolItem();
+				gtk_tool_item_set_tooltip(gtkItem, myGtkToolbar->tooltips, parameterItem.tooltip().c_str(), 0);
+			}
+			break;
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+			gtkItem = createGtkToolButton((const ZLToolbar::AbstractButtonItem&)*item);
+			break;
+		case ZLToolbar::Item::SEPARATOR:
+			gtkItem = gtk_separator_tool_item_new();
+			break;
+	}
+	if (gtkItem != 0) {
+		gtk_toolbar_insert(myGtkToolbar, gtkItem, -1);
+		myAbstractToGtk[&*item] = gtkItem;
+		myGtkToAbstract[gtkItem] = item;
+		gtk_widget_show_all(GTK_WIDGET(gtkItem));
+	}
+}
+
+static bool itemActivated(GtkWidget *menuItem, gpointer data) {
+	GtkMenu *menu = GTK_MENU(gtk_widget_get_parent(menuItem));
+	GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+	int index = g_list_index(children, (gconstpointer)menuItem);
+	((ZLPopupData*)data)->run(index);
+	return true;
+}
+
+void ZLGtkApplicationWindow::Toolbar::updatePopupData(GtkMenuToolButton *button, shared_ptr<ZLPopupData> data) {
+	if (data.isNull()) {
+		return;
+	}
+
+	const size_t id = data->id();
+	if (id == myPopupIdMap[GTK_TOOL_ITEM(button)]) {
+		return;
+	}
+	myPopupIdMap[GTK_TOOL_ITEM(button)] = id;
+
+	GtkMenu *menu = GTK_MENU(gtk_menu_tool_button_get_menu(button));
+	GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+	if (children != 0) {
+		for (GList *ptr =  g_list_last(children); ; ptr = g_list_previous(ptr)) {
+			gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(ptr->data));
+			if (ptr == children) {
+				break;
+			}
+		}
+	}
+
+	const size_t count = data->count();
+	for (size_t i = 0; i < count; ++i) {
+		GtkWidget *item = gtk_menu_item_new_with_label(data->text(i).c_str());
+		gtk_widget_show_all(item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(item), "activate", GTK_SIGNAL_FUNC(itemActivated), &*data);
+	}
+}
+
+void ZLGtkApplicationWindow::Toolbar::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	std::map<const ZLToolbar::Item*,GtkToolItem*>::const_iterator it = myAbstractToGtk.find(&*item);
+	if (it == myAbstractToGtk.end()) {
+		return;
+	}
+
+	GtkToolItem *gtkItem = it->second;
+	if (visible) {
+		gtk_widget_show(GTK_WIDGET(gtkItem));
+	} else {
+		gtk_widget_hide(GTK_WIDGET(gtkItem));
+	}
+	/*
+	 * Not sure, but looks like gtk_widget_set_sensitive(WIDGET, false)
+	 * does something strange if WIDGET is already insensitive.
+	 */
+	bool alreadyEnabled = GTK_WIDGET_STATE(GTK_WIDGET(gtkItem)) != GTK_STATE_INSENSITIVE;
+	if (enabled != alreadyEnabled) {
+		gtk_widget_set_sensitive(GTK_WIDGET(gtkItem), enabled);
+	}
+
+	if (item->type() == ZLToolbar::Item::MENU_BUTTON) {
+		updatePopupData(
+			GTK_MENU_TOOL_BUTTON(gtkItem),
+			((ZLToolbar::MenuButtonItem&)*item).popupData()
+		);
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,6 @@
  * 02110-1301, USA.
  */
 
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
 #include <ZLibrary.h>
 
 #include "ZLGtkApplicationWindow.h"
@@ -28,60 +25,37 @@
 #include "../util/ZLGtkSignalUtil.h"
 #include "../dialogs/ZLGtkDialogManager.h"
 #include "../view/ZLGtkViewWidget.h"
-#include "../../../../core/src/dialogs/ZLOptionView.h"
 
 void ZLGtkDialogManager::createApplicationWindow(ZLApplication *application) const {
 	myWindow = (new ZLGtkApplicationWindow(application))->getMainWindow();
 }
 
-static bool applicationQuit(GtkWidget*, GdkEvent*, gpointer data) {
-	((ZLGtkApplicationWindow*)data)->application().closeView();
+static bool applicationQuit(GtkWidget*, GdkEvent*, ZLGtkApplicationWindow *data) {
+	data->application().closeView();
 	return true;
 }
 
-static void onButtonClicked(GtkWidget *button, gpointer data) {
-	((ZLGtkApplicationWindow*)data)->onGtkButtonPress(button);
-}
-
-static bool handleKeyEvent(GtkWidget*, GdkEventKey *event, gpointer data) {
-	return ((ZLGtkApplicationWindow*)data)->handleKeyEventSlot(event);
-}
-
-static void handleScrollEvent(GtkWidget*, GdkEventScroll *event, gpointer data) {
-	((ZLGtkApplicationWindow*)data)->handleScrollEventSlot(event);
-}
-
-static const std::string OPTIONS = "Options";
-
-ZLGtkApplicationWindow::Toolbar::Toolbar(ZLGtkApplicationWindow *window) : myWindow(window), myWidgetCounter(0) {
-	myGtkToolbar = GTK_TOOLBAR(gtk_toolbar_new());
-	gtk_toolbar_set_style(myGtkToolbar, GTK_TOOLBAR_ICONS);
-}
-
-GtkWidget *ZLGtkApplicationWindow::Toolbar::toolbarWidget() const {
-	return GTK_WIDGET(myGtkToolbar);
-}
-
-ZLApplication::Toolbar::ButtonItem &ZLGtkApplicationWindow::Toolbar::buttonItemByWidget(GtkWidget *gtkButton) {
-	return (ZLApplication::Toolbar::ButtonItem&)*myWidgetToButton[gtkButton];
+static bool presentHandler(GtkWidget*, GdkEvent*, GtkWindow *data) {
+	gtk_window_present(data);
+	return false;
 }
 
-void ZLGtkApplicationWindow::Toolbar::attachWidget(ZLOptionView&, GtkWidget *widget) {
-	gtk_toolbar_append_widget(myGtkToolbar, widget, 0, 0);
-	++myWidgetCounter;
+static bool handleKeyEvent(GtkWidget*, GdkEventKey *event, ZLGtkApplicationWindow *data) {
+	return data->handleKeyEventSlot(event);
 }
 
-void ZLGtkApplicationWindow::Toolbar::attachWidgets(ZLOptionView &view, GtkWidget *widget0, GtkWidget *widget1) {
-	attachWidget(view, widget0);
-	attachWidget(view, widget1);
+static void handleScrollEvent(GtkWidget*, GdkEventScroll *event, ZLGtkApplicationWindow *data) {
+	data->handleScrollEventSlot(event);
 }
 
 ZLGtkApplicationWindow::ZLGtkApplicationWindow(ZLApplication *application) :
 	ZLDesktopApplicationWindow(application),
+	myViewWidget(0),
 	myHyperlinkCursor(0),
 	myHyperlinkCursorIsUsed(false),
-	myToolbar(this) {
-
+	myWindowToolbar(this),
+	myFullscreenToolbar(this),
+	myHandleBox(0) {
 	myMainWindow = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL));
 	const std::string iconFileName = ZLibrary::ImageDirectory() + ZLibrary::FileNameDelimiter + ZLibrary::ApplicationName() + ".png";
 	gtk_window_set_icon(myMainWindow, gdk_pixbuf_new_from_file(iconFileName.c_str(), 0));
@@ -90,7 +64,15 @@
 	myVBox = gtk_vbox_new(false, 0);
 	gtk_container_add(GTK_CONTAINER(myMainWindow), myVBox);
 
-	gtk_box_pack_start(GTK_BOX(myVBox), myToolbar.toolbarWidget(), false, false, 0);
+	if (hasFullscreenToolbar()) {
+		myHandleBox = GTK_HANDLE_BOX(gtk_handle_box_new());
+		gtk_toolbar_set_show_arrow(GTK_TOOLBAR(myFullscreenToolbar.toolbarWidget()), false);
+		gtk_container_add(GTK_CONTAINER(myHandleBox), myFullscreenToolbar.toolbarWidget());
+		gtk_box_pack_start(GTK_BOX(myVBox), GTK_WIDGET(myHandleBox), false, false, 0);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myHandleBox), "event", GTK_SIGNAL_FUNC(presentHandler), myMainWindow);
+	}
+
+	gtk_box_pack_start(GTK_BOX(myVBox), myWindowToolbar.toolbarWidget(), false, false, 0);
 
 	gtk_window_resize(myMainWindow, myWidthOption.value(), myHeightOption.value());
 	gtk_window_move(myMainWindow, myXOption.value(), myYOption.value());
@@ -134,6 +116,19 @@
 	}
 }
 
+void ZLGtkApplicationWindow::refresh() {
+	ZLDesktopApplicationWindow::refresh();
+	ToolbarType type =
+		isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR;
+	gtk_widget_queue_resize(toolbar(type).toolbarWidget());
+}
+
+void ZLGtkApplicationWindow::processAllEvents() {
+	while (gtk_events_pending()) {
+		gtk_main_iteration();
+	}
+}
+
 bool ZLGtkApplicationWindow::handleKeyEventSlot(GdkEventKey *event) {
 	GtkWidget *widget = gtk_window_get_focus(myMainWindow);
 	if ((widget == 0) || !GTK_WIDGET_CAN_FOCUS(widget) || GTK_IS_DRAWING_AREA(widget)) {
@@ -156,33 +151,50 @@
 	}
 }
 
-void ZLGtkApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	myToolbar.setToggleButtonState(button);
+void ZLGtkApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	toolbar(type(button)).setToggleButtonState(button);
 }
 
-void ZLGtkApplicationWindow::Toolbar::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	GtkToggleButton *gtkButton = GTK_TOGGLE_BUTTON(myButtonToWidget[&(ZLApplication::Toolbar::Item&)button]);
-	const bool isPressed = button.isPressed();
-	if (gtk_toggle_button_get_active(gtkButton) != isPressed) {
-		gtk_toggle_button_set_active(gtkButton, isPressed);
+void ZLGtkApplicationWindow::onGtkButtonPress(GtkToolItem *gtkButton) {
+	ToolbarType type =
+		isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR;
+	onButtonPress(toolbar(type).buttonItemByWidget(gtkButton));
+	if (isFullscreen()) {
+		gtk_window_present(myMainWindow);
 	}
 }
 
-void ZLGtkApplicationWindow::onGtkButtonPress(GtkWidget *gtkButton) {
-	onButtonPress(myToolbar.buttonItemByWidget(gtkButton));
-}
-
 void ZLGtkApplicationWindow::setFullscreen(bool fullscreen) {
 	if (fullscreen == isFullscreen()) {
 		return;
 	}
 
+	GdkWindowState state = gdk_window_get_state(GTK_WIDGET(myMainWindow)->window);
 	if (fullscreen) {
+		if ((state & GDK_WINDOW_STATE_MAXIMIZED) == 0) {
+			int x, y, width, height;
+			gtk_window_get_position(myMainWindow, &x, &y);
+			gtk_window_get_size(myMainWindow, &width, &height);
+			myXOption.setValue(x);
+			myYOption.setValue(y);
+			myWidthOption.setValue(width);
+			myHeightOption.setValue(height);
+		}
 		gtk_window_fullscreen(myMainWindow);
-		gtk_widget_hide(myToolbar.toolbarWidget());
+		gtk_widget_hide(myWindowToolbar.toolbarWidget());
+		if (myHandleBox != 0) {
+			gtk_widget_show_all(GTK_WIDGET(myHandleBox));
+		}
 	} else {
 		gtk_window_unfullscreen(myMainWindow);
-		gtk_widget_show(myToolbar.toolbarWidget());
+		if (myHandleBox != 0) {
+			gtk_widget_hide(GTK_WIDGET(myHandleBox));
+		}
+		gtk_widget_show(myWindowToolbar.toolbarWidget());
+		if ((state & GDK_WINDOW_STATE_MAXIMIZED) == 0) {
+			gtk_window_resize(myMainWindow, myWidthOption.value(), myHeightOption.value());
+			gtk_window_move(myMainWindow, myXOption.value(), myYOption.value());
+		}
 	}
 
 	gtk_widget_queue_resize(GTK_WIDGET(myMainWindow));
@@ -194,109 +206,23 @@
 		GDK_WINDOW_STATE_FULLSCREEN;
 }
 
-void ZLGtkApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	myToolbar.addToolbarItem(item);
+void ZLGtkApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr item) {
+	toolbar(type(*item)).addToolbarItem(item);
 }
 
-void ZLGtkApplicationWindow::Toolbar::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	switch (item->type()) {
-		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
-			{
-				shared_ptr<ZLOptionEntry> entry = ((const ZLApplication::Toolbar::OptionEntryItem&)*item).entry();
-				ZLOptionView *view = createViewByEntry("", "", entry);
-				if (view != 0) {
-					myViews.push_back(view);
-					entry->setVisible(true);
-				}
-			}
-			break;
-		case ZLApplication::Toolbar::Item::BUTTON:
-			{
-				const ZLApplication::Toolbar::ButtonItem &buttonItem = (const ZLApplication::Toolbar::ButtonItem&)*item;
-				static std::string imagePrefix = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
-				GtkWidget *image = gtk_image_new_from_file((imagePrefix + buttonItem.iconName() + ".png").c_str());
-				GtkWidget *button = buttonItem.isToggleButton() ? gtk_toggle_button_new() : gtk_button_new();
-				gtk_button_set_relief((GtkButton*)button, GTK_RELIEF_NONE);
-				GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
-				gtk_container_add(GTK_CONTAINER(button), image);
-				gtk_toolbar_append_widget(myGtkToolbar, button, buttonItem.tooltip().c_str(), 0);
-				ZLGtkSignalUtil::connectSignal(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(onButtonClicked), myWindow);
-				myButtonToWidget[&*item] = button;
-				myWidgetToButton[button] = item;
-				gtk_widget_show_all(button);
-			}
-			break;
-		case ZLApplication::Toolbar::Item::SEPARATOR:
-			mySeparatorMap[item] = myButtonToWidget.size() + myWidgetCounter;
-			mySeparatorVisibilityMap.push_back(std::pair<ZLApplication::Toolbar::ItemPtr,bool>(item, false));
-			break;
-	}
-}
-
-void ZLGtkApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	myToolbar.setToolbarItemState(item, visible, enabled);
-}
-
-void ZLGtkApplicationWindow::Toolbar::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	switch (item->type()) {
-		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
-			break;
-		case ZLApplication::Toolbar::Item::BUTTON:
-			{
-				std::map<const ZLApplication::Toolbar::Item*,GtkWidget*>::const_iterator it = myButtonToWidget.find(&*item);
-				if (it != myButtonToWidget.end()) {
-					GtkWidget *gtkButton = it->second;
-					if (visible) {
-						gtk_widget_show(gtkButton);
-					} else {
-						gtk_widget_hide(gtkButton);
-					}
-					/*
-					 * Not sure, but looks like gtk_widget_set_sensitive(WIDGET, false)
-					 * does something strange if WIDGET is already insensitive.
-					 */
-					bool alreadyEnabled = GTK_WIDGET_STATE(gtkButton) != GTK_STATE_INSENSITIVE;
-					if (enabled != alreadyEnabled) {
-						gtk_widget_set_sensitive(gtkButton, enabled);
-					}
-				}
-			}
-			break;
-		case ZLApplication::Toolbar::Item::SEPARATOR:
-			{
-				std::map<const shared_ptr<ZLApplication::Toolbar::Item>,int>::iterator it = mySeparatorMap.find(item);
-				if (it != mySeparatorMap.end()) {
-					int index = it->second;
-					std::vector<std::pair<ZLApplication::Toolbar::ItemPtr,bool> >::iterator jt;
-					for (jt = mySeparatorVisibilityMap.begin(); jt != mySeparatorVisibilityMap.end(); ++jt) {
-						if (jt->first == it->first) {
-							break;
-						}
-						if (jt->second) {
-							++index;
-						}
-					}
-					if (visible) {
-						if (!jt->second) {
-							gtk_toolbar_insert_space(myGtkToolbar, index);
-						}
-					} else {
-						if (jt->second) {
-							gtk_toolbar_remove_space(myGtkToolbar, index);
-						}
-					}
-					jt->second = visible;
-				}
-			}
-			break;
-	}
+void ZLGtkApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	toolbar(type(*item)).setToolbarItemState(item, visible, enabled);
 }
 
 ZLViewWidget *ZLGtkApplicationWindow::createViewWidget() {
-	ZLGtkViewWidget *viewWidget = new ZLGtkViewWidget(&application(), (ZLViewWidget::Angle)application().AngleStateOption.value());
-	gtk_container_add(GTK_CONTAINER(myVBox), viewWidget->area());
-	gtk_widget_show_all(myVBox);
-	return viewWidget;
+	myViewWidget = new ZLGtkViewWidget(&application(), (ZLView::Angle)application().AngleStateOption.value());
+	gtk_container_add(GTK_CONTAINER(myVBox), myViewWidget->areaWithScrollbars());
+	gtk_widget_show(myVBox);
+	gtk_widget_show(myWindowToolbar.toolbarWidget());
+	if (myHandleBox != 0) {
+		gtk_widget_hide(GTK_WIDGET(myHandleBox));
+	}
+	return myViewWidget;
 }
 
 void ZLGtkApplicationWindow::close() {
@@ -317,8 +243,12 @@
 		if (myHyperlinkCursor == 0) {
 			myHyperlinkCursor = gdk_cursor_new(GDK_HAND1);
 		}
-		gdk_window_set_cursor(GTK_WIDGET(myMainWindow)->window, myHyperlinkCursor);
+		gdk_window_set_cursor(myViewWidget->area()->window, myHyperlinkCursor);
 	} else {
-		gdk_window_set_cursor(GTK_WIDGET(myMainWindow)->window, 0);
+		gdk_window_set_cursor(myViewWidget->area()->window, 0);
 	}
 }
+
+void ZLGtkApplicationWindow::setFocusToMainWidget() {
+	gtk_window_set_focus(myMainWindow, myViewWidget->area());
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/application-pepperpad3/ZLGtkApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,11 +26,15 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtktoolbar.h>
+#include <gtk/gtktoolitem.h>
+#include <gtk/gtkmenutoolbutton.h>
+#include <gtk/gtkentry.h>
+#include <gtk/gtkhandlebox.h>
 
 #include "../../../../core/src/desktop/application/ZLDesktopApplicationWindow.h"
-#include "../optionView/ZLGtkOptionViewHolder.h"
+#include "../../../../core/src/application/ZLToolbar.h"
 
-class ZLOptionView;
+class ZLGtkViewWidget;
 
 class ZLGtkApplicationWindow : public ZLDesktopApplicationWindow { 
 
@@ -40,8 +44,10 @@
 
 private:
 	ZLViewWidget *createViewWidget();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void init();
+	void refresh();
+	void processAllEvents();
 	void close();
 
 	void grabAllKeys(bool grab);
@@ -53,52 +59,81 @@
 	bool isFullscreen() const;
 	void setFullscreen(bool fullscreen);
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
 
 public:
 	bool handleKeyEventSlot(GdkEventKey *event);
 	void handleScrollEventSlot(GdkEventScroll *event);
-	void onGtkButtonPress(GtkWidget *gtkButton);
+	void onGtkButtonPress(GtkToolItem *gtkButton);
 
 	GtkWindow *getMainWindow() { return myMainWindow; }
+	void setFocusToMainWidget();
+
+public:
+	class GtkEntryParameter : public VisualParameter {
+
+	public:
+		GtkEntryParameter(ZLGtkApplicationWindow &window, const ZLToolbar::ParameterItem &item);
+		bool onKeyPressed(const std::string &keyName);
+		void onValueChanged();
+		GtkToolItem *createToolItem();
+
+	private:
+		std::string internalValue() const;
+		void internalSetValue(const std::string &value);
+		void setValueList(const std::vector<std::string> &values);
+
+	private:
+		ZLGtkApplicationWindow &myWindow;
+		const ZLToolbar::ParameterItem &myItem;
+		GtkWidget *myWidget;
+		GtkEntry *myEntry;
+	};
 
 private:
 	GtkWindow *myMainWindow;
+	ZLGtkViewWidget *myViewWidget;
 
 	GtkWidget *myVBox;
 
 	GdkCursor *myHyperlinkCursor;
 	bool myHyperlinkCursorIsUsed;
 
-	class Toolbar : public ZLGtkOptionViewHolder {
+	class Toolbar {
 
 	public:
 		Toolbar(ZLGtkApplicationWindow *window);
 
 		GtkWidget *toolbarWidget() const;
 
-		void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
-		void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-		void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
-		ZLApplication::Toolbar::ButtonItem &buttonItemByWidget(GtkWidget *gtkButton);
+		void addToolbarItem(ZLToolbar::ItemPtr item);
+		void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+		void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
+		ZLToolbar::AbstractButtonItem &buttonItemByWidget(GtkToolItem *gtkButton);
 
 	private:
-		void attachWidget(ZLOptionView &view, GtkWidget *widget);
-		void attachWidgets(ZLOptionView &view, GtkWidget *widget0, GtkWidget *widget1);
+		GtkToolItem *createGtkToolButton(const ZLToolbar::AbstractButtonItem &button);
+		void updatePopupData(GtkMenuToolButton *button, shared_ptr<ZLPopupData> data);
 
 	private:
 		ZLGtkApplicationWindow *myWindow;
 		GtkToolbar *myGtkToolbar;
-		std::map<const ZLApplication::Toolbar::Item*,GtkWidget*> myButtonToWidget;
-		std::map<GtkWidget*,ZLApplication::Toolbar::ItemPtr> myWidgetToButton;
-		std::map<ZLApplication::Toolbar::ItemPtr,int> mySeparatorMap;
-		std::vector<std::pair<ZLApplication::Toolbar::ItemPtr,bool> > mySeparatorVisibilityMap;
-		std::vector<shared_ptr<ZLOptionView> > myViews;
-		int myWidgetCounter;
+		std::map<const ZLToolbar::Item*,GtkToolItem*> myAbstractToGtk;
+		std::map<GtkToolItem*,ZLToolbar::ItemPtr> myGtkToAbstract;
+		std::map<GtkToolItem*,size_t> myPopupIdMap;
+
+	friend class ZLGtkApplicationWindow;
 	};
 
-	Toolbar myToolbar;
+	Toolbar myWindowToolbar;
+	Toolbar myFullscreenToolbar;
+
+	Toolbar &toolbar(ToolbarType type) {
+		return (type == WINDOW_TOOLBAR) ? myWindowToolbar : myFullscreenToolbar;
+	}
+
+	GtkHandleBox *myHandleBox;
 };
 
 #endif /* __ZLGTKAPPLICATIONWINDOW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include <gtk/gtk.h>
 
+#include "../image/ZLGtkImageManager.h"
 #include "ZLGtkDialogManager.h"
 #include "ZLGtkDialog.h"
 #include "ZLGtkOptionsDialog.h"
@@ -34,20 +35,20 @@
 	return new ZLGtkOptionsDialog(resource()[id], applyAction, showApplyButton);
 }
 
-void ZLGtkDialogManager::informationBox(const ZLResourceKey &key, const std::string &message) const {
-	internalBox(GTK_STOCK_DIALOG_INFO, key, message);
+void ZLGtkDialogManager::informationBox(const std::string &title, const std::string &message) const {
+	internalBox(GTK_STOCK_DIALOG_INFO, title, message);
 }
 
 void ZLGtkDialogManager::errorBox(const ZLResourceKey &key, const std::string &message) const {
-	internalBox(GTK_STOCK_DIALOG_ERROR, key, message);
+	internalBox(GTK_STOCK_DIALOG_ERROR, dialogTitle(key), message);
 }
 
 int ZLGtkDialogManager::questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const {
-	return internalBox(GTK_STOCK_DIALOG_QUESTION, key, message, button0, button1, button2);
+	return internalBox(GTK_STOCK_DIALOG_QUESTION, dialogTitle(key), message, button0, button1, button2);
 }
 
-int ZLGtkDialogManager::internalBox(const gchar *icon, const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const {
-	GtkDialog *dialog = createGtkDialog(dialogTitle(key));
+int ZLGtkDialogManager::internalBox(const gchar *icon, const std::string &title, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const {
+	GtkDialog *dialog = createGtkDialog(title);
 
 	if (!button0.Name.empty()) {
 		gtk_dialog_add_button(dialog, gtkString(buttonName(button0)).c_str(), 0);
@@ -97,3 +98,12 @@
 		gtk_clipboard_set_text(clipboard, text.data(), text.length());
 	}
 }
+
+void ZLGtkDialogManager::setClipboardImage(const ZLImageData &image, ClipboardType type) const {
+	GdkPixbuf *imageRef = ((const ZLGtkImageData&)image).pixbuf();
+	if (imageRef != 0) {
+		GdkAtom atom = (type == CLIPBOARD_MAIN) ? GDK_SELECTION_CLIPBOARD : GDK_SELECTION_PRIMARY;
+		GtkClipboard *clipboard = gtk_clipboard_get(atom);
+		gtk_clipboard_set_image(clipboard, imageRef);
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 
 	shared_ptr<ZLDialog> createDialog(const ZLResourceKey &key) const;
 	shared_ptr<ZLOptionsDialog> createOptionsDialog(const ZLResourceKey &id, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const;
-	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	void informationBox(const std::string &title, const std::string &message) const;
 	void errorBox(const ZLResourceKey &key, const std::string &message) const;
 	int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const;
 	bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const;
@@ -48,12 +48,13 @@
 
 	bool isClipboardSupported(ClipboardType type) const;
 	void setClipboardText(const std::string &text, ClipboardType type) const;
+	void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const;
 
 	void grabKeyboard(bool grab) { myIsKeyboardGrabbed = grab; }
 	bool isKeyboardGrabbed() const { return myIsKeyboardGrabbed; }
 
 private:
-	int internalBox(const gchar *icon, const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0 = OK_BUTTON, const ZLResourceKey &button1 = ZLResourceKey(), const ZLResourceKey &button2 = ZLResourceKey()) const;
+	int internalBox(const gchar *icon, const std::string &title, const std::string &message, const ZLResourceKey &button0 = OK_BUTTON, const ZLResourceKey &button1 = ZLResourceKey(), const ZLResourceKey &button2 = ZLResourceKey()) const;
 
 private:
 	mutable GtkWindow *myWindow;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,6 +64,14 @@
 	while (gtk_events_pending()) {
 		gtk_main_iteration();
 	}
+
+	if (myParent != 0) {
+		gtk_widget_queue_draw(GTK_WIDGET(myParent));
+	}
+
+	while (gtk_events_pending()) {
+		gtk_main_iteration();
+	}
 }
 
 ZLGtkWaitMessage::~ZLGtkWaitMessage() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/dialogs/ZLGtkWaitMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/filesystem/ZLGtkFSManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/image/ZLGtkImageManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/image/ZLGtkImageManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/image/ZLGtkImageManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/image/ZLGtkImageManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/image/ZLGtkImageManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/image/ZLGtkImageManager.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/image/ZLGtkImageManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/image/ZLGtkImageManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include <ZLApplication.h>
 #include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 
 #include "../../../../core/src/unix/library/ZLibraryImplementation.h"
 
@@ -69,6 +70,7 @@
 void ZLGtkLibraryImplementation::run(ZLApplication *application) {
 	ZLDialogManager::instance().createApplicationWindow(application);
 	application->initWindow();
+	gtk_widget_set_default_direction(ZLLanguageUtil::isRTLLanguage(ZLibrary::Language()) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
 	gtk_main();
 	delete application;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 #include "../util/ZLGtkKeyUtil.h"
 
 static GtkLabel *gtkLabel(const std::string &name) {
-	GtkLabel *label = GTK_LABEL(gtk_label_new((gtkString(name) + ":").c_str()));
+	GtkLabel *label = GTK_LABEL(gtk_label_new(gtkString(name).c_str()));
 	gtk_label_set_justify(label, GTK_JUSTIFY_RIGHT);
 	return label;
 }
@@ -374,8 +374,8 @@
 	gtk_color_selection_get_current_color(myColorSelection, &gdkColor);
 	colorEntry.onReset(convertColor(gdkColor));
 
-	GdkColor initialColor = convertColor(((ZLColorOptionEntry&)*myOption).initialColor());
-	GdkColor currentColor = convertColor(((ZLColorOptionEntry&)*myOption).color());
+	GdkColor initialColor = convertColor(colorEntry.initialColor());
+	GdkColor currentColor = convertColor(colorEntry.color());
 	gtk_color_selection_set_current_color(myColorSelection, &currentColor);
 	gtk_color_selection_set_previous_color(myColorSelection, &initialColor);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/optionView/ZLGtkOptionViewHolder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/pixbuf/ZLGtkPixbufHack.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/time/ZLGtkTime.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/time/ZLGtkTime.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/time/ZLGtkTime.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/time/ZLGtkTime.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/time/ZLGtkTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/time/ZLGtkTime.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/time/ZLGtkTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/time/ZLGtkTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkKeyUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/util/ZLGtkSignalUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -226,7 +226,7 @@
 	}
 }
 
-int ZLGtkPaintContext::stringWidth(const char *str, int len) const {
+int ZLGtkPaintContext::stringWidth(const char *str, int len, bool rtl) const {
 	if (myContext == 0) {
 		return 0;
 	}
@@ -235,6 +235,7 @@
 		return 0;
 	}
 
+	myAnalysis.level = rtl ? 1 : 0;
 	pango_shape(str, len, &myAnalysis, myString);
 	PangoRectangle logicalRectangle;
 	pango_glyph_string_extents(myString, myAnalysis.font, 0, &logicalRectangle);
@@ -243,7 +244,7 @@
 
 int ZLGtkPaintContext::spaceWidth() const {
 	if (mySpaceWidth == -1) {
-		mySpaceWidth = stringWidth(" ", 1);
+		mySpaceWidth = stringWidth(" ", 1, false);
 	}
 	return mySpaceWidth;
 }
@@ -271,17 +272,18 @@
 	return myDescent;
 }
 
-void ZLGtkPaintContext::drawString(int x, int y, const char *str, int len) {
+void ZLGtkPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
 	if (!g_utf8_validate(str, len, 0)) {
 		return;
 	}
 
+	myAnalysis.level = rtl ? 1 : 0;
 	pango_shape(str, len, &myAnalysis, myString);
 	gdk_draw_glyphs(myPixmap, myTextGC, myAnalysis.font, x, y, myString);
 }
 
 void ZLGtkPaintContext::drawImage(int x, int y, const ZLImageData &image) {
-	GdkPixbuf *imageRef = ((ZLGtkImageData&)image).pixbuf();
+	GdkPixbuf *imageRef = ((const ZLGtkImageData&)image).pixbuf();
 	if (imageRef != 0) {
 		gdk_pixbuf_render_to_drawable(
 			imageRef, myPixmap,
@@ -330,6 +332,7 @@
 }
 
 void ZLGtkPaintContext::clear(ZLColor color) {
+	myBackColor = color;
 	if (myPixmap != 0) {
 		::setColor(myBackGC, color);
 		gdk_draw_rectangle(myPixmap, myBackGC, true, 0, 0, myWidth, myHeight);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,11 +47,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
@@ -63,9 +63,9 @@
 	GdkPixmap *myPixmap;
 	int myWidth, myHeight;
 
-  PangoContext *myContext;
+	PangoContext *myContext;
 
-  PangoFontDescription *myFontDescription;
+	PangoFontDescription *myFontDescription;
 	mutable PangoAnalysis myAnalysis;
 	PangoGlyphString *myString;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,8 +17,13 @@
  * 02110-1301, USA.
  */
 
+#include <algorithm>
+
 #include <gtk/gtkwindow.h>
 
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
+
 #include "ZLGtkViewWidget.h"
 #include "ZLGtkPaintContext.h"
 #include "../util/ZLGtkSignalUtil.h"
@@ -28,18 +33,18 @@
 	switch (viewWidget->rotation()) {
 		default:
 			break;
-		case ZLViewWidget::DEGREES90:
+		case ZLView::DEGREES90:
 		{
 			int tmp = x;
 			x = viewWidget->height() - y;
 			y = tmp;
 			break;
 		}
-		case ZLViewWidget::DEGREES180:
+		case ZLView::DEGREES180:
 			x = viewWidget->width() - x;
 			y = viewWidget->height() - y;
 			break;
-		case ZLViewWidget::DEGREES270:
+		case ZLView::DEGREES270:
 		{
 			int tmp = x;
 			x = y;
@@ -79,15 +84,15 @@
 		state = (GdkModifierType)event->state;
 	}
 	updatePoint(viewWidget, x, y);
-	if (state == 0) {
+	if ((state & 0xFF00) == 0) {
 		viewWidget->view()->onStylusMove(x, y);
 	} else {
 		viewWidget->view()->onStylusMovePressed(x, y);
 	}
 }
 
-static void doPaint(GtkWidget*, GdkEventExpose *event, gpointer data) {
-	((ZLGtkViewWidget*)data)->doPaint();
+static void doPaint(GtkWidget*, GdkEventExpose*, ZLGtkViewWidget *data) {
+	data->doPaint();
 }
 
 int ZLGtkViewWidget::width() const {
@@ -98,10 +103,97 @@
 	return (myArea != 0) ? myArea->allocation.height : 0;
 }
 
-ZLGtkViewWidget::ZLGtkViewWidget(ZLApplication *application, Angle initialAngle) : ZLViewWidget(initialAngle) {
+bool ZLGtkViewWidget::scrollbarEvent(ZLView::Direction direction, GtkRange *range, GtkScrollType type, double newValue) {
+	static bool alreadyProcessed = false;
+	if (alreadyProcessed) {
+		return true;
+	}
+	alreadyProcessed = true;
+
+	bool code = true;
+	switch (type) {
+		default:
+			code = false;
+			break;
+  	case GTK_SCROLL_JUMP:
+		{
+			GtkAdjustment *adjustment = gtk_range_get_adjustment(range);
+			const int upper = (int)adjustment->upper;
+			onScrollbarMoved(
+				direction,
+				upper,
+				std::max(std::min((int)newValue, upper), 0),
+				std::max(std::min((int)(newValue + adjustment->page_size), upper), 0)
+			);
+			code = false;
+			break;
+		}
+  	case GTK_SCROLL_STEP_BACKWARD:
+			onScrollbarStep(direction, -1);
+			break;
+  	case GTK_SCROLL_STEP_FORWARD:
+			onScrollbarStep(direction, 1);
+			break;
+  	case GTK_SCROLL_PAGE_BACKWARD:
+			onScrollbarPageStep(direction, -1);
+			break;
+  	case GTK_SCROLL_PAGE_FORWARD:
+			onScrollbarPageStep(direction, 1);
+			break;
+	}
+	gtk_widget_send_expose(myArea, gdk_event_new(GDK_EXPOSE));
+	alreadyProcessed = false;
+	return code;
+}
+
+static bool vScrollbarEvent(GtkRange *range, GtkScrollType type, double newValue, ZLGtkViewWidget *data) {
+	return data->scrollbarEvent(ZLView::VERTICAL, range, type, newValue);
+}
+
+static bool hScrollbarEvent(GtkRange *range, GtkScrollType type, double newValue, ZLGtkViewWidget *data) {
+	return data->scrollbarEvent(ZLView::HORIZONTAL, range, type, newValue);
+}
+
+GtkWidget *ZLGtkViewWidget::createVScrollbar(int pos) {
+	GtkWidget *vScrollbar = gtk_vscrollbar_new(myVerticalAdjustment);
+	gtk_range_set_update_policy(GTK_RANGE(vScrollbar), GTK_UPDATE_CONTINUOUS);
+	gtk_table_attach(myTable, vScrollbar, pos, pos + 1, 1, 2, GTK_FILL, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(vScrollbar), "change_value", GTK_SIGNAL_FUNC(vScrollbarEvent), this);
+	gtk_widget_hide(vScrollbar);
+	return vScrollbar;
+}
+
+GtkWidget *ZLGtkViewWidget::createHScrollbar(int pos) {
+	GtkWidget *hScrollbar = gtk_hscrollbar_new(myHorizontalAdjustment);
+	gtk_range_set_update_policy(GTK_RANGE(hScrollbar), GTK_UPDATE_CONTINUOUS);
+	gtk_table_attach(myTable, hScrollbar, 1, 2, pos, pos + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), GTK_FILL, 0, 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(hScrollbar), "change_value", GTK_SIGNAL_FUNC(hScrollbarEvent), this);
+	gtk_widget_hide(hScrollbar);
+	return hScrollbar;
+}
+
+ZLGtkViewWidget::ZLGtkViewWidget(ZLApplication *application, ZLView::Angle initialAngle) : ZLViewWidget(initialAngle) {
 	myApplication = application;
 	myArea = gtk_drawing_area_new();
 	GTK_OBJECT_SET_FLAGS(myArea, GTK_CAN_FOCUS);
+
+	myTable = GTK_TABLE(gtk_table_new(3, 3, false));
+	gtk_table_attach(myTable, myArea, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
+	gtk_widget_show(GTK_WIDGET(myTable));
+	gtk_widget_show(myArea);
+
+	myVerticalAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new(100, 0, 100, 1, 1, 1));
+	myShowScrollBarAtRight = true;
+	myVerticalScrollbarIsVisible = false;
+	myLeftScrollBar = createVScrollbar(0);
+	myRightScrollBar = createVScrollbar(2);
+
+	myHorizontalAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new(100, 0, 100, 1, 1, 1));
+	myShowScrollBarAtBottom = true;
+	myHorizontalScrollbarIsVisible = false;
+	myTopScrollBar = createHScrollbar(0);
+	myBottomScrollBar = createHScrollbar(2);
+
 	myOriginalPixbuf = 0;
 	myRotatedPixbuf = 0;
 	gtk_widget_set_double_buffered(myArea, false);
@@ -113,6 +205,67 @@
 	myRepaintBlocked = false;
 }
 
+void ZLGtkViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+	GtkWidget *scrollbar = (direction == ZLView::VERTICAL) ?
+		(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar) :
+		(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+
+	if (direction == ZLView::VERTICAL) {
+		myVerticalScrollbarIsVisible = enabled;
+	} else {
+		myHorizontalScrollbarIsVisible = enabled;
+	}
+
+	if (enabled) {
+		gtk_widget_show(scrollbar);
+		gtk_widget_queue_draw(scrollbar);
+	} else {
+		gtk_widget_hide(scrollbar);
+	}
+}
+
+void ZLGtkViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+	if ((rotation() == ZLView::DEGREES90) || (rotation() == ZLView::DEGREES270)) {
+		if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+			standard = !standard;
+		}
+	}
+
+	if (direction == ZLView::VERTICAL) {
+		if (myVerticalScrollbarIsVisible) {
+			gtk_widget_hide(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar);
+		}
+		myShowScrollBarAtRight = standard;
+		if (myVerticalScrollbarIsVisible) {
+			gtk_widget_show(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar);
+		}
+	} else {
+		if (myHorizontalScrollbarIsVisible) {
+			gtk_widget_hide(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+		}
+		myShowScrollBarAtBottom = standard;
+		if (myHorizontalScrollbarIsVisible) {
+			gtk_widget_show(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+		}
+	}
+}
+
+void ZLGtkViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	GtkAdjustment *adjustment =
+		(direction == ZLView::VERTICAL) ? myVerticalAdjustment : myHorizontalAdjustment;
+	adjustment->lower = 0;
+	adjustment->upper = full;
+	adjustment->value = from;
+	adjustment->step_increment = to - from;
+	adjustment->page_increment = to - from;
+	adjustment->page_size = to - from;
+
+	GtkWidget *scrollbar = (direction == ZLView::VERTICAL) ?
+		(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar) :
+		(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+	gtk_widget_queue_draw(scrollbar);
+}
+
 ZLGtkViewWidget::~ZLGtkViewWidget() {
 	cleanOriginalPixbuf();
 	cleanRotatedPixbuf();
@@ -145,8 +298,8 @@
 
 void ZLGtkViewWidget::doPaint()	{
 	ZLGtkPaintContext &gtkContext = (ZLGtkPaintContext&)view()->context();
-	Angle angle = rotation();
-	bool isRotated = (angle == DEGREES90) || (angle == DEGREES270);
+	ZLView::Angle angle = rotation();
+	bool isRotated = (angle == ZLView::DEGREES90) || (angle == ZLView::DEGREES270);
 	int w = isRotated ? myArea->allocation.height : myArea->allocation.width;
 	int h = isRotated ? myArea->allocation.width : myArea->allocation.height;
 	gtkContext.updatePixmap(myArea, w, h);
@@ -155,10 +308,9 @@
 		default:
 			cleanOriginalPixbuf();
 			cleanRotatedPixbuf();
-			gdk_draw_pixmap(myArea->window, myArea->style->white_gc, gtkContext.pixmap(),
-											0, 0, 0, 0, myArea->allocation.width, myArea->allocation.height);
+			gdk_draw_pixmap(myArea->window, myArea->style->white_gc, gtkContext.pixmap(), 0, 0, 0, 0, myArea->allocation.width, myArea->allocation.height);
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			cleanRotatedPixbuf();
 			if ((myOriginalPixbuf != 0) &&
 					((gdk_pixbuf_get_width(myOriginalPixbuf) != w) ||
@@ -170,14 +322,12 @@
 				myImage = gdk_image_new(GDK_IMAGE_FASTEST, gdk_drawable_get_visual(gtkContext.pixmap()), w, h);
 			}
 			gdk_drawable_copy_to_image(gtkContext.pixmap(), myImage, 0, 0, 0, 0, w, h);
-			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()),
-																0, 0, 0, 0, w, h);
+			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()), 0, 0, 0, 0, w, h);
 			::rotate180(myOriginalPixbuf);
-			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myOriginalPixbuf,
-											0, 0, 0, 0, w, h, GDK_RGB_DITHER_NONE, 0, 0);
+			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myOriginalPixbuf, 0, 0, 0, 0, w, h, GDK_RGB_DITHER_NONE, 0, 0);
 			break;
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			if ((myOriginalPixbuf != 0) &&
 					((gdk_pixbuf_get_width(myOriginalPixbuf) != w) ||
 					 (gdk_pixbuf_get_height(myOriginalPixbuf) != h))) {
@@ -196,14 +346,20 @@
 				myRotatedPixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, h, w);
 			}
 			gdk_drawable_copy_to_image(gtkContext.pixmap(), myImage, 0, 0, 0, 0, w, h);
-			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()),
-																0, 0, 0, 0, w, h);
-			::rotate90(myRotatedPixbuf, myOriginalPixbuf, angle == DEGREES90);
-			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myRotatedPixbuf,
-											0, 0, 0, 0, h, w, GDK_RGB_DITHER_NONE, 0, 0);
+			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()), 0, 0, 0, 0, w, h);
+			::rotate90(myRotatedPixbuf, myOriginalPixbuf, angle == ZLView::DEGREES90);
+			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myRotatedPixbuf, 0, 0, 0, 0, h, w, GDK_RGB_DITHER_NONE, 0, 0);
 			break;
 	}
 	myRepaintBlocked = true;
 	myApplication->refreshWindow();
 	myRepaintBlocked = false;
 }
+
+GtkWidget *ZLGtkViewWidget::area() {
+	return myArea;
+}
+
+GtkWidget *ZLGtkViewWidget::areaWithScrollbars() {
+	return GTK_WIDGET(myTable);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/gtk/view/ZLGtkViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,35 +22,58 @@
 
 #include <gtk/gtk.h>
 
-#include <ZLView.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
 #include <ZLApplication.h>
 
 class ZLGtkViewWidget : public ZLViewWidget {
 
 public:
-	ZLGtkViewWidget(ZLApplication *application, Angle initialAngle);
+	ZLGtkViewWidget(ZLApplication *application, ZLView::Angle initialAngle);
 	~ZLGtkViewWidget();
 
 	int width() const;
 	int height() const;
 	void doPaint();
 
-	GtkWidget *area() { return myArea; }
+	GtkWidget *area();
+	GtkWidget *areaWithScrollbars();
+
+	bool scrollbarEvent(ZLView::Direction direction, GtkRange *range, GtkScrollType type, double newValue);
 
 private:
 	void trackStylus(bool track);
 	void repaint();
 
+	GtkWidget *createVScrollbar(int pos);
+	GtkWidget *createHScrollbar(int pos);
+
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to);
+
 	void cleanOriginalPixbuf();
 	void cleanRotatedPixbuf();
 
 private:
 	ZLApplication *myApplication;
 	GtkWidget *myArea;
+	GtkTable *myTable;
 	GdkPixbuf *myOriginalPixbuf;
 	GdkPixbuf *myRotatedPixbuf;
 	GdkImage *myImage;
 	bool myRepaintBlocked;
+
+	GtkAdjustment *myVerticalAdjustment;
+	GtkWidget *myRightScrollBar;
+	GtkWidget *myLeftScrollBar;
+	bool myShowScrollBarAtRight;
+	bool myVerticalScrollbarIsVisible;
+
+	GtkAdjustment *myHorizontalAdjustment;
+	GtkWidget *myBottomScrollBar;
+	GtkWidget *myTopScrollBar;
+	bool myShowScrollBarAtBottom;
+	bool myHorizontalScrollbarIsVisible;
 };
 
 #endif /* __ZLGTKVIEWWIDGET_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/application/GtkEntryParameter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <gtk/gtkmenutoolbutton.h>
+#include <gtk/gtkentry.h>
+
+#include "ZLGtkApplicationWindow.h"
+
+#include "../../gtk/util/ZLGtkKeyUtil.h"
+#include "../../gtk/util/ZLGtkSignalUtil.h"
+
+void ZLGtkApplicationWindow::GtkEntryParameter::onKeyPressed(const std::string &keyName) {
+	if (keyName == "<Enter>") {
+		myWindow.application().doAction(myItem.actionId());
+		myWindow.setFocusToMainWidget();
+	} else if (keyName == "<Escape>") {
+		restoreOldValue();
+		myWindow.setFocusToMainWidget();
+	}
+}
+
+static bool onKeyPressed(GtkEntry*, GdkEventKey *event, ZLGtkApplicationWindow::GtkEntryParameter *parameter) {
+	parameter->onKeyPressed(ZLGtkKeyUtil::keyName(event));
+	return false;
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::onValueChanged() {
+	GtkComboBox *comboBox = GTK_COMBO_BOX(myWidget);
+	const int index = gtk_combo_box_get_active(comboBox);
+	const int size = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(comboBox), 0);
+	if ((index >= 0) && (index < size)) {
+		const char *text = gtk_combo_box_get_active_text(comboBox);
+		if (text != 0) {
+			std::string sText = text;
+			if (!sText.empty()) {
+				myWindow.application().doAction(myItem.actionId());
+				//myWindow.setFocusToMainWidget();
+			}
+		}
+	}
+}
+
+static bool onValueChanged(GtkComboBox*, ZLGtkApplicationWindow::GtkEntryParameter *parameter) {
+	parameter->onValueChanged();
+	return true;
+}
+
+ZLGtkApplicationWindow::GtkEntryParameter::GtkEntryParameter(ZLGtkApplicationWindow &window, const ZLToolbar::ParameterItem &item) : myWindow(window), myItem(item) {
+	if (item.type() == ZLToolbar::Item::COMBO_BOX) {
+		myWidget = gtk_combo_box_entry_new_text();
+		myEntry = GTK_ENTRY(GTK_BIN(myWidget)->child);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "changed", GTK_SIGNAL_FUNC(::onValueChanged), this);
+	} else {
+		myWidget = gtk_entry_new();
+		myEntry = GTK_ENTRY(myWidget);
+	}
+	gtk_entry_set_alignment(myEntry, 0.5);
+	gtk_entry_set_width_chars(myEntry, item.maxWidth());
+	gtk_entry_set_max_length(myEntry, item.maxWidth());
+	if (item.symbolSet() == ZLToolbar::ParameterItem::SET_DIGITS) {
+		hildon_gtk_entry_set_input_mode(myEntry, HILDON_GTK_INPUT_MODE_NUMERIC);
+	} else {
+		hildon_gtk_entry_set_input_mode(myEntry, HILDON_GTK_INPUT_MODE_FULL);
+	}
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEntry), "key_press_event", GTK_SIGNAL_FUNC(::onKeyPressed), this);
+}
+
+GtkToolItem *ZLGtkApplicationWindow::GtkEntryParameter::createToolItem() {
+	GtkToolItem *toolItem = gtk_tool_item_new();
+	gtk_container_add(GTK_CONTAINER(toolItem), myWidget);
+	return toolItem;
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::internalSetValue(const std::string &value) {
+	gtk_entry_set_text(myEntry, value.c_str());
+}
+
+std::string ZLGtkApplicationWindow::GtkEntryParameter::internalValue() const {
+	return gtk_entry_get_text(myEntry);
+}
+
+void ZLGtkApplicationWindow::GtkEntryParameter::setValueList(const std::vector<std::string> &values) {
+	if (myItem.type() == ZLToolbar::Item::TEXT_FIELD) {
+		return;
+	}
+
+	GtkComboBox *comboBox = GTK_COMBO_BOX(myWidget);
+
+	int size = gtk_tree_model_iter_n_children(gtk_combo_box_get_model(comboBox), 0);
+	for (; size > 0; --size) {
+		gtk_combo_box_remove_text(comboBox, 0);
+	}
+
+	for (std::vector<std::string>::const_iterator it = values.begin(); it != values.end(); ++it) {
+		gtk_combo_box_append_text(comboBox, it->c_str());
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include <ZLibrary.h>
 #include <ZLOptionEntry.h>
 #include <optionEntries/ZLSimpleOptionEntry.h>
+#include <ZLPopupData.h>
 
 #include "../message/ZLMaemoMessage.h"
 #include "../view/ZLGtkViewWidget.h"
@@ -67,16 +68,16 @@
 
 static bool handleKeyPress(GtkWidget*, GdkEventKey *key, gpointer data) {
 	if (acceptAction()) {
-		((ZLGtkApplicationWindow*)data)->handleKeyEventSlot(key, false);
+		return ((ZLGtkApplicationWindow*)data)->handleKeyEventSlot(key, false);
 	}
-	return false;
+	return true;
 }
 
 static bool handleKeyRelease(GtkWidget*, GdkEventKey *key, gpointer data) {
 	if (acceptAction()) {
-		((ZLGtkApplicationWindow*)data)->handleKeyEventSlot(key, true);
+		return ((ZLGtkApplicationWindow*)data)->handleKeyEventSlot(key, true);
 	}
-	return false;
+	return true;
 }
 
 static void mousePressed(GtkWidget *area, GdkEventButton *event, gpointer data) {
@@ -131,10 +132,6 @@
 
 ZLGtkApplicationWindow::~ZLGtkApplicationWindow() {
 	((ZLGtkDialogManager&)ZLGtkDialogManager::instance()).setMainWindow(0);
-	for (std::map<const ZLApplication::Toolbar::ButtonItem*,ToolbarButton*>::iterator it = myToolbarButtons.begin(); it != myToolbarButtons.end(); ++it) {
-		delete it->second;
-	}
-
 	((ZLMaemoCommunicationManager&)ZLCommunicationManager::instance()).shutdown();
 }
 
@@ -155,20 +152,21 @@
 	myMenuStack.push(myWindow.myMenu);
 }
 
-void ZLGtkApplicationWindow::MenuBuilder::processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu) {
+void ZLGtkApplicationWindow::MenuBuilder::processSubmenuBeforeItems(ZLMenubar::Submenu &submenu) {
 	GtkMenuItem *gtkItem = GTK_MENU_ITEM(gtk_menu_item_new_with_label(submenu.menuName().c_str()));
 	GtkMenu *gtkSubmenu = GTK_MENU(gtk_menu_new());
 	gtk_menu_item_set_submenu(gtkItem, GTK_WIDGET(gtkSubmenu));
 	gtk_menu_shell_append(GTK_MENU_SHELL(myMenuStack.top()), GTK_WIDGET(gtkItem));
 	gtk_widget_show_all(GTK_WIDGET(gtkItem));
 	myMenuStack.push(gtkSubmenu);
+	myWindow.mySubmenuItems.push_back(gtkItem);
 }
 
-void ZLGtkApplicationWindow::MenuBuilder::processSubmenuAfterItems(ZLApplication::Menubar::Submenu&) {
+void ZLGtkApplicationWindow::MenuBuilder::processSubmenuAfterItems(ZLMenubar::Submenu&) {
 	myMenuStack.pop();
 }
 
-void ZLGtkApplicationWindow::MenuBuilder::processItem(ZLApplication::Menubar::PlainItem &item) {
+void ZLGtkApplicationWindow::MenuBuilder::processItem(ZLMenubar::PlainItem &item) {
 	GtkMenuItem *gtkItem = GTK_MENU_ITEM(gtk_menu_item_new_with_label(item.name().c_str()));
 	const std::string &id = item.actionId();
 	shared_ptr<ZLApplication::Action> action = myWindow.application().action(id);
@@ -180,16 +178,18 @@
 	gtk_widget_show_all(GTK_WIDGET(gtkItem));
 }
 
-void ZLGtkApplicationWindow::MenuBuilder::processSepartor(ZLApplication::Menubar::Separator&) {
+void ZLGtkApplicationWindow::MenuBuilder::processSepartor(ZLMenubar::Separator&) {
 	GtkMenuItem *gtkItem = GTK_MENU_ITEM(gtk_separator_menu_item_new());
 	gtk_menu_shell_append(GTK_MENU_SHELL(myMenuStack.top()), GTK_WIDGET(gtkItem));
 	gtk_widget_show_all(GTK_WIDGET(gtkItem));
 }
 
-void ZLGtkApplicationWindow::handleKeyEventSlot(GdkEventKey *event, bool isKeyRelease) {
+bool ZLGtkApplicationWindow::handleKeyEventSlot(GdkEventKey *event, bool isKeyRelease) {
+	const std::string &keyName = ZLGtkKeyUtil::keyName(event);
 	if ((myViewWidget != 0) && (KeyActionOnReleaseNotOnPressOption.value() == isKeyRelease)) {
-		application().doActionByKey(ZLGtkKeyUtil::keyName(event));
+		application().doActionByKey(keyName);
 	}
+	return keyName == "<Escape>";
 }
 
 void ZLGtkApplicationWindow::setFullscreen(bool fullscreen) {
@@ -216,89 +216,144 @@
 	gtk_main_quit();
 }
 
-class ZLGtkToolItemWrapper : public ZLGtkOptionViewHolder {
-
-public:
-	ZLGtkToolItemWrapper(GtkToolItem *item);
+static void onButtonClicked(GtkToolItem *gtkItem, gpointer data) {
+	((ZLGtkApplicationWindow*)data)->onGtkButtonPress(gtkItem);
+}
 
-private:
-	void attachWidget(ZLOptionView &view, GtkWidget *widget);
-	void attachWidgets(ZLOptionView &view, GtkWidget *widget0, int weight0, GtkWidget *widget1, int weight1);
+GtkToolItem *ZLGtkApplicationWindow::createGtkToolButton(const ZLToolbar::AbstractButtonItem &button) {
+	GtkToolItem *gtkItem = 0;
+	static std::string imagePrefix =
+		ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
+	GtkWidget *image = gtk_image_new_from_file(
+		(imagePrefix + button.iconName() + ".png").c_str()
+	);
 
-private:
-	GtkToolItem *myItem;
-};
+	switch (button.type()) {
+		case ZLToolbar::Item::PLAIN_BUTTON:
+			gtkItem = gtk_tool_button_new(image, button.tooltip().c_str());
+			break;
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+			gtkItem = gtk_toggle_tool_button_new();
+			gtk_tool_button_set_label(GTK_TOOL_BUTTON(gtkItem), button.tooltip().c_str());
+			gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(gtkItem), image);
+			break;
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			gtkItem = gtk_menu_tool_button_new(image, button.tooltip().c_str());
+			const ZLToolbar::MenuButtonItem &menuButton =
+				(const ZLToolbar::MenuButtonItem&)button;
+			shared_ptr<ZLPopupData> popupData = menuButton.popupData();
+			myPopupIdMap[gtkItem] =
+				popupData.isNull() ? (size_t)-1 : (popupData->id() - 1);
+			gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(gtkItem), gtk_menu_new());
+			gtk_menu_tool_button_set_arrow_tooltip(GTK_MENU_TOOL_BUTTON(gtkItem), myToolbar->tooltips, menuButton.popupTooltip().c_str(), 0);
+			break;
+		}
+		default:
+			break;
+	}
 
-ZLGtkToolItemWrapper::ZLGtkToolItemWrapper(GtkToolItem *item) : myItem(item) {
-}
+	gtk_tool_item_set_tooltip(gtkItem, myToolbar->tooltips, button.tooltip().c_str(), 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(gtkItem), "clicked", GTK_SIGNAL_FUNC(onButtonClicked), this);
+	//GTK_WIDGET_UNSET_FLAGS(gtkItem, GTK_CAN_FOCUS);
 
-void ZLGtkToolItemWrapper::attachWidget(ZLOptionView&, GtkWidget *widget) {
-	gtk_container_set_border_width(GTK_CONTAINER(myItem), 2);
-	gtk_container_add(GTK_CONTAINER(myItem), widget);
+	return gtkItem;
 }
 
-void ZLGtkToolItemWrapper::attachWidgets(ZLOptionView&, GtkWidget *widget0, int weight0, GtkWidget *widget1, int weight1) {
-	// TODO: implement
-}
-
-void ZLGtkApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
+void ZLGtkApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr item) {
 	GtkToolItem *gtkItem = 0;
 	switch (item->type()) {
-		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
+		case ZLToolbar::Item::TEXT_FIELD:
+		case ZLToolbar::Item::COMBO_BOX:
 			{
-				shared_ptr<ZLOptionEntry> entry = ((const ZLApplication::Toolbar::OptionEntryItem&)*item).entry();
-				gtkItem = gtk_tool_item_new();
-				ZLGtkToolItemWrapper wrapper(gtkItem);
-				ZLOptionView *view = wrapper.createViewByEntry("", "", entry);
-				if (view != 0) {
-					gtk_tool_item_set_homogeneous(gtkItem, false);
-					gtk_tool_item_set_expand(gtkItem, false);
-					GTK_WIDGET_UNSET_FLAGS(gtkItem, GTK_CAN_FOCUS);
-					myViews.push_back(view);
-					entry->setVisible(true);
-				} else {
-					// TODO: remove *gtkItem
-					gtkItem = 0;
-				}
+				const ZLToolbar::ParameterItem &parameterItem = (const ZLToolbar::ParameterItem&)*item;
+				GtkEntryParameter *parameter =
+					new GtkEntryParameter(*this, parameterItem);
+				addVisualParameter(parameterItem.parameterId(), parameter);
+				gtkItem = parameter->createToolItem();
+				gtk_tool_item_set_tooltip(gtkItem, myToolbar->tooltips, parameterItem.tooltip().c_str(), 0);
 			}
 			break;
-		case ZLApplication::Toolbar::Item::BUTTON:
-			{
-				ZLApplication::Toolbar::ButtonItem &buttonItem = (ZLApplication::Toolbar::ButtonItem&)*item;
-      
-				ToolbarButton *toolbarButton = new ToolbarButton(buttonItem, *this);
-				gtkItem = toolbarButton->toolItem();
-				myToolbarButtons[&buttonItem] = toolbarButton;
-			}
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+			gtkItem = createGtkToolButton((ZLToolbar::AbstractButtonItem&)*item);
 			break;
-		case ZLApplication::Toolbar::Item::SEPARATOR:
-			{
-				gtkItem = gtk_separator_tool_item_new();
-				gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(gtkItem), false);
-			}
+		case ZLToolbar::Item::SEPARATOR:
+			gtkItem = gtk_separator_tool_item_new();
+			gtk_separator_tool_item_set_draw(GTK_SEPARATOR_TOOL_ITEM(gtkItem), false);
 			break;
 	}
 	if (gtkItem != 0) {
 		gtk_toolbar_insert(myToolbar, gtkItem, -1);
-		myToolItems[item] = gtkItem;
+		myAbstractToGtk[&*item] = gtkItem;
+		myGtkToAbstract[gtkItem] = item;
 		gtk_widget_show_all(GTK_WIDGET(gtkItem));
 	}
 }
 
-void ZLGtkApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	std::map<ZLApplication::Toolbar::ItemPtr,GtkToolItem*>::iterator it = myToolItems.find(item);
-	if (it != myToolItems.end()) {
-		GtkToolItem *toolItem = it->second;
-		gtk_tool_item_set_visible_horizontal(toolItem, visible);
-		/*
-		 * Not sure, but looks like gtk_widget_set_sensitive(WIDGET, false)
-		 * does something strange if WIDGET is already insensitive.
-		 */
-		bool alreadyEnabled = GTK_WIDGET_STATE(toolItem) != GTK_STATE_INSENSITIVE;
-		if (enabled != alreadyEnabled) {
-			gtk_widget_set_sensitive(GTK_WIDGET(toolItem), enabled);
+static bool itemActivated(GtkWidget *menuItem, gpointer data) {
+	GtkMenu *menu = GTK_MENU(gtk_widget_get_parent(menuItem));
+	GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+	int index = g_list_index(children, (gconstpointer)menuItem);
+	((ZLPopupData*)data)->run(index);
+	return true;
+}
+
+void ZLGtkApplicationWindow::updatePopupData(GtkMenuToolButton *button, shared_ptr<ZLPopupData> data) {
+	if (data.isNull()) {
+		return;
+	}
+
+	const size_t id = data->id();
+	if (id == myPopupIdMap[GTK_TOOL_ITEM(button)]) {
+		return;
+	}
+	myPopupIdMap[GTK_TOOL_ITEM(button)] = id;
+
+	GtkMenu *menu = GTK_MENU(gtk_menu_tool_button_get_menu(button));
+	GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+	if (children != 0) {
+		for (GList *ptr =  g_list_last(children); ; ptr = g_list_previous(ptr)) {
+			gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(ptr->data));
+			if (ptr == children) {
+				break;
+			}
 		}
 	}
+
+	const size_t count = data->count();
+	for (size_t i = 0; i < count; ++i) {
+		GtkWidget *item = gtk_menu_item_new_with_label(data->text(i).c_str());
+		gtk_widget_show_all(item);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+		ZLGtkSignalUtil::connectSignal(GTK_OBJECT(item), "activate", GTK_SIGNAL_FUNC(itemActivated), &*data);
+	}
+}
+
+void ZLGtkApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	std::map<const ZLToolbar::Item*,GtkToolItem*>::const_iterator it = myAbstractToGtk.find(&*item);
+	if (it == myAbstractToGtk.end()) {
+		return;
+	}
+
+	GtkToolItem *toolItem = it->second;
+	gtk_tool_item_set_visible_horizontal(toolItem, visible);
+	/*
+	 * Not sure, but looks like gtk_widget_set_sensitive(WIDGET, false)
+	 * does something strange if WIDGET is already insensitive.
+	 */
+	bool alreadyEnabled = GTK_WIDGET_STATE(toolItem) != GTK_STATE_INSENSITIVE;
+	if (enabled != alreadyEnabled) {
+		gtk_widget_set_sensitive(GTK_WIDGET(toolItem), enabled);
+	}
+
+	if (item->type() == ZLToolbar::Item::MENU_BUTTON) {
+		updatePopupData(
+			GTK_MENU_TOOL_BUTTON(toolItem),
+			((ZLToolbar::MenuButtonItem&)*item).popupData()
+		);
+	}
 }
 
 void ZLGtkApplicationWindow::present() {
@@ -321,18 +376,43 @@
 			gtk_widget_set_sensitive(gtkItem, !alreadyEnabled);
 		}
 	}
+	for (std::vector<GtkMenuItem*>::reverse_iterator rit = mySubmenuItems.rbegin(); rit != mySubmenuItems.rend(); ++rit) {
+		bool isEnabled = false;
+		GtkMenu *menu = GTK_MENU(gtk_menu_item_get_submenu(*rit));
+		GList *children = gtk_container_get_children(GTK_CONTAINER(menu));
+		if (children != 0) {
+			for (GList *ptr =  g_list_first(children); ptr != 0; ptr = g_list_next(ptr)) {
+				GtkMenuItem *item = GTK_MENU_ITEM(ptr->data);
+				if (GTK_WIDGET_VISIBLE(item)) {
+					isEnabled = true;
+					break;
+				}
+			}
+		}
+		if (isEnabled) {
+			gtk_widget_show(GTK_WIDGET(*rit));
+		} else {
+			gtk_widget_hide(GTK_WIDGET(*rit));
+		}
+	}
+}
+
+void ZLGtkApplicationWindow::processAllEvents() {
+	while (gtk_events_pending()) {
+		gtk_main_iteration();
+	}
 }
 
 ZLViewWidget *ZLGtkApplicationWindow::createViewWidget() {
-	myViewWidget = new ZLGtkViewWidget(&application(), (ZLViewWidget::Angle)application().AngleStateOption.value());
+	myViewWidget = new ZLGtkViewWidget(&application(), (ZLView::Angle)application().AngleStateOption.value());
 	GtkWidget *area = myViewWidget->area();
-	gtk_container_add(GTK_CONTAINER(myWindow), area);
+	gtk_container_add(GTK_CONTAINER(myWindow), myViewWidget->areaWithScrollbars());
 	GtkObject *areaObject = GTK_OBJECT(area);
 	ZLGtkSignalUtil::connectSignal(areaObject, "expose_event", GTK_SIGNAL_FUNC(repaint), myViewWidget);
 	ZLGtkSignalUtil::connectSignal(areaObject, "button_press_event", GTK_SIGNAL_FUNC(mousePressed), myViewWidget);
 	ZLGtkSignalUtil::connectSignal(areaObject, "button_release_event", GTK_SIGNAL_FUNC(mouseReleased), myViewWidget);
 	ZLGtkSignalUtil::connectSignal(areaObject, "motion_notify_event", GTK_SIGNAL_FUNC(mouseMoved), myViewWidget);
-	gtk_widget_show_all(GTK_WIDGET(myWindow));
+	gtk_widget_show(GTK_WIDGET(myWindow));
 
 	ZLGtkOptionsDialog::addMaemoBuilder(this);
 
@@ -342,85 +422,19 @@
 void ZLGtkApplicationWindow::grabAllKeys(bool) {
 }
 
-static void onGtkButtonPress(GtkWidget*, GdkEventButton*, gpointer data) {
-	if (acceptAction()) {
-		((ZLGtkApplicationWindow::ToolbarButton*)data)->press(true);
-	}
+void ZLGtkApplicationWindow::onGtkButtonPress(GtkToolItem *gtkItem) {
+	onButtonPress((ZLToolbar::AbstractButtonItem&)*myGtkToAbstract[gtkItem]);
 }
 
-static void onGtkButtonRelease(GtkWidget*, GdkEventButton*, gpointer data) {
-	if (acceptAction()) {
-		((ZLGtkApplicationWindow::ToolbarButton*)data)->press(false);
+void ZLGtkApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	GtkToggleToolButton *gtkButton =
+		GTK_TOGGLE_TOOL_BUTTON(myAbstractToGtk[&(ZLToolbar::Item&)button]);
+	const bool isPressed = button.isPressed();
+	if (gtk_toggle_tool_button_get_active(gtkButton) != isPressed) {
+		gtk_toggle_tool_button_set_active(gtkButton, isPressed);
 	}
 }
 
-ZLGtkApplicationWindow::ToolbarButton::ToolbarButton(ZLApplication::Toolbar::ButtonItem &buttonItem, ZLGtkApplicationWindow &window) : myButtonItem(buttonItem), myWindow(window) {
-	myAction = myWindow.application().action(buttonItem.actionId());
-
-	GdkPixbuf *filePixbuf = gdk_pixbuf_new_from_file((ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter + buttonItem.iconName() + ".png").c_str(), 0);
-
-	const int width = gdk_pixbuf_get_width(filePixbuf);
-	const int height = gdk_pixbuf_get_height(filePixbuf);
-	const int border = 4;
-	const int line = 2;
-	const GdkColorspace colorspace = gdk_pixbuf_get_colorspace(filePixbuf);
-	const bool hasAlpha = gdk_pixbuf_get_has_alpha(filePixbuf);
-	const int bitsPerSample = gdk_pixbuf_get_bits_per_sample(filePixbuf);
-
-	const int w = width + 2 * border;
-	const int h = height + 2 * border;
-	GdkPixbuf *buttonPixbuf = gdk_pixbuf_new(colorspace, hasAlpha, bitsPerSample, w, h);
-	gdk_pixbuf_fill(buttonPixbuf, 0);
-	gdk_pixbuf_copy_area(filePixbuf, 0, 0, width, height, buttonPixbuf, border, border);
-	myCurrentImage = GTK_IMAGE(gtk_image_new_from_pixbuf(buttonPixbuf));
-	myReleasedImage = GTK_IMAGE(gtk_image_new_from_pixbuf(buttonPixbuf));
-
-	GdkPixbuf *pressedButtonPixbuf = gdk_pixbuf_copy(buttonPixbuf);
-	GdkPixbuf *top = gdk_pixbuf_new_subpixbuf(pressedButtonPixbuf, 0, 0, w, line);
-	GdkPixbuf *bottom = gdk_pixbuf_new_subpixbuf(pressedButtonPixbuf, 0, h - line, w, line);
-	GdkPixbuf *left = gdk_pixbuf_new_subpixbuf(pressedButtonPixbuf, 0, 0, line, h);
-	GdkPixbuf *right = gdk_pixbuf_new_subpixbuf(pressedButtonPixbuf, w - line, 0, line, h);
-	gdk_pixbuf_fill(top, 0x00007FFF);
-	gdk_pixbuf_fill(bottom, 0x00007FFF);
-	gdk_pixbuf_fill(left, 0x00007FFF);
-	gdk_pixbuf_fill(right, 0x00007FFF);
-	gdk_pixbuf_copy_area(filePixbuf, 0, 0, width, height, pressedButtonPixbuf, border, border);
-	myPressedImage = GTK_IMAGE(gtk_image_new_from_pixbuf(pressedButtonPixbuf));
-
-	gdk_pixbuf_unref(filePixbuf);
-	gdk_pixbuf_unref(buttonPixbuf);
-	gdk_pixbuf_unref(pressedButtonPixbuf);
-
-	myEventBox = gtk_event_box_new();
-	gtk_container_add(GTK_CONTAINER(myEventBox), GTK_WIDGET(myCurrentImage));
-	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEventBox), "button_press_event", GTK_SIGNAL_FUNC(onGtkButtonPress), this);
-	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(myEventBox), "button_release_event", GTK_SIGNAL_FUNC(onGtkButtonRelease), this);
-
-	myToolItem = gtk_tool_item_new();
-	gtk_container_add(GTK_CONTAINER(myToolItem), myEventBox);
-	gtk_tool_item_set_homogeneous(myToolItem, false);
-	gtk_tool_item_set_expand(myToolItem, false);
-	GTK_WIDGET_UNSET_FLAGS(myToolItem, GTK_CAN_FOCUS);
-}
-
-void ZLGtkApplicationWindow::ToolbarButton::forcePress(bool state) {
-	gtk_image_set_from_pixbuf(myCurrentImage, gtk_image_get_pixbuf(state ? myPressedImage : myReleasedImage));
-}
-
-void ZLGtkApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	myToolbarButtons[&button]->forcePress(button.isPressed());
-}
-
-void ZLGtkApplicationWindow::ToolbarButton::press(bool state) {
-	if (!myButtonItem.isToggleButton()) {
-		forcePress(state);
-		if (state) {
-			return;
-		}
-	}
-	myWindow.onButtonPress(myButtonItem);
-}
-
 void ZLGtkApplicationWindow::buildTabs(ZLOptionsDialog &dialog) {
 	ZLDialogContent &tab = dialog.createTab(ZLResourceKey("Maemo"));
 	tab.addOption(
@@ -436,3 +450,7 @@
 		new ZLSimpleSpinOptionEntry(myViewWidget->MaxPressureOption, 1)
 	);
 }
+
+void ZLGtkApplicationWindow::setFocusToMainWidget() {
+	gtk_window_set_focus(GTK_WINDOW(myWindow), myViewWidget->area());
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/application/ZLGtkApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwindow.h>
 
-#if MAEMO_VERSION == 2
+#if MAEMO_VERSION <= 3
 	#include <hildon-widgets/hildon-program.h>
 #elif MAEMO_VERSION == 4
 	#include <hildon/hildon-program.h>
@@ -36,6 +36,7 @@
 #endif
 
 #include "../../../../core/src/application/ZLApplicationWindow.h"
+#include "../../../../core/src/application/ZLMenu.h"
 #include "../../../../core/src/dialogs/ZLDialogContentBuilder.h"
 
 class ZLGtkViewWidget;
@@ -52,19 +53,21 @@
 private:
 	ZLViewWidget *createViewWidget();
 	void init();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	GtkToolItem *createGtkToolButton(const ZLToolbar::AbstractButtonItem &button);
+	void updatePopupData(GtkMenuToolButton *button, shared_ptr<ZLPopupData> data);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void buildTabs(ZLOptionsDialog &dialog);
 
-	class MenuBuilder : public ZLApplication::MenuVisitor {
+	class MenuBuilder : public ZLMenuVisitor {
 
 	public:
 		MenuBuilder(ZLGtkApplicationWindow &window);
 
 	private:
-		void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu);
-		void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu);
-		void processItem(ZLApplication::Menubar::PlainItem &item);
-		void processSepartor(ZLApplication::Menubar::Separator &separator);
+		void processSubmenuBeforeItems(ZLMenubar::Submenu &submenu);
+		void processSubmenuAfterItems(ZLMenubar::Submenu &submenu);
+		void processItem(ZLMenubar::PlainItem &item);
+		void processSepartor(ZLMenubar::Separator &separator);
 
 	private:
 		ZLGtkApplicationWindow &myWindow;
@@ -72,6 +75,7 @@
 	};
 	void initMenu();
 	void refresh();
+	void processAllEvents();
 	void present();
 	void close();
 
@@ -82,36 +86,34 @@
 
 	void grabAllKeys(bool grab);
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
 
 public:
-	void handleKeyEventSlot(GdkEventKey *event, bool isKeyRelease);
+	bool handleKeyEventSlot(GdkEventKey *event, bool isKeyRelease);
+	void onGtkButtonPress(GtkToolItem *gtkButton);
 	HildonWindow *getMainWindow() const { return myWindow; }
+	void setFocusToMainWidget();
 
 public:
-	class ToolbarButton {
+	class GtkEntryParameter : public VisualParameter {
 
 	public:
-		void press(bool state);
+		GtkEntryParameter(ZLGtkApplicationWindow &window, const ZLToolbar::ParameterItem &item);
+		void onKeyPressed(const std::string &keyName);
+		void onValueChanged();
+		GtkToolItem *createToolItem();
 
 	private:
-		ToolbarButton(ZLApplication::Toolbar::ButtonItem &buttonItem, ZLGtkApplicationWindow &window);
-		void forcePress(bool state);
-		GtkToolItem *toolItem() const { return myToolItem; }
+		std::string internalValue() const;
+		void internalSetValue(const std::string &value);
+		void setValueList(const std::vector<std::string> &values);
 
 	private:
-		ZLApplication::Toolbar::ButtonItem &myButtonItem;
 		ZLGtkApplicationWindow &myWindow;
-		shared_ptr<ZLApplication::Action> myAction;
-
-		GtkToolItem *myToolItem;
-		GtkWidget *myEventBox;
-		GtkImage *myCurrentImage;
-		GtkImage *myReleasedImage;
-		GtkImage *myPressedImage;
-
-	friend class ZLGtkApplicationWindow;
+		const ZLToolbar::ParameterItem &myItem;
+		GtkWidget *myWidget;
+		GtkEntry *myEntry;
 	};
 
 private:
@@ -123,13 +125,13 @@
 
 	bool myFullScreen;
 
-	std::map<ZLApplication::Toolbar::ItemPtr,GtkToolItem*> myToolItems;
+	std::map<const ZLToolbar::Item*,GtkToolItem*> myAbstractToGtk;
+	std::map<GtkToolItem*,ZLToolbar::ItemPtr> myGtkToAbstract;
+	std::map<GtkToolItem*,size_t> myPopupIdMap;
 	std::map<std::string,GtkMenuItem*> myMenuItems;
-	std::map<const ZLApplication::Toolbar::ButtonItem*,ToolbarButton*> myToolbarButtons;
-	std::vector<shared_ptr<ZLOptionView> > myViews;
+	std::vector<GtkMenuItem*> mySubmenuItems;
 
 friend class MenuBuilder;
-friend class ToolbarButton;
 };
 
 #endif /* __ZLGTKAPPLICATIONWINDOW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <gtk/gtk.h>
 
-#if MAEMO_VERSION == 2
+#if MAEMO_VERSION <= 3
 	#include <hildon-widgets/gtk-infoprint.h>
 	#include <hildon-note.h>
 #elif MAEMO_VERSION == 4
@@ -34,6 +34,7 @@
 #include "ZLGtkOptionsDialog.h"
 #include "ZLGtkSelectionDialog.h"
 #include "ZLGtkUtil.h"
+#include "../../gtk/image/ZLGtkImageManager.h"
 
 shared_ptr<ZLDialog> ZLGtkDialogManager::createDialog(const ZLResourceKey &key) const {
 	return new ZLGtkDialog(resource()[key]);
@@ -43,7 +44,7 @@
 	return new ZLGtkOptionsDialog(resource()[key], applyAction);
 }
 
-void ZLGtkDialogManager::informationBox(const ZLResourceKey&, const std::string &message) const {
+void ZLGtkDialogManager::informationBox(const std::string&, const std::string &message) const {
 	GtkDialog *dialog = GTK_DIALOG(hildon_note_new_information(myWindow, message.c_str()));
 	gtk_dialog_run(dialog);
 	gtk_widget_destroy(GTK_WIDGET(dialog));
@@ -81,7 +82,7 @@
 
 struct RunnableWithFlag {
 	ZLRunnable *runnable;
-	bool flag;
+	volatile bool flag;
 };
 
 static void *runRunnable(void *data) {
@@ -97,7 +98,7 @@
 		runnable.run();
 	} else {
 		myIsWaiting = true;
-#if MAEMO_VERSION == 2
+#if MAEMO_VERSION <= 3
 		gtk_banner_show_animation(myWindow, waitMessageText(key).c_str());
 #elif MAEMO_VERSION == 4
 		GtkWidget *banner = hildon_banner_show_animation(GTK_WIDGET(myWindow), NULL, waitMessageText(key).c_str());
@@ -113,7 +114,7 @@
 			gtk_main_iteration();
 		}
 		pthread_join(thread, 0);
-#if MAEMO_VERSION == 2
+#if MAEMO_VERSION <= 3
 		gtk_banner_close(myWindow);
 #elif MAEMO_VERSION == 4
 		gtk_widget_destroy(banner);
@@ -135,3 +136,12 @@
 		gtk_clipboard_set_text(clipboard, text.data(), text.length());
 	}
 }
+
+void ZLGtkDialogManager::setClipboardImage(const ZLImageData &image, ClipboardType type) const {
+	GdkPixbuf *imageRef = ((const ZLGtkImageData&)image).pixbuf();
+	if (imageRef != 0) {
+		GdkAtom atom = (type == CLIPBOARD_MAIN) ? GDK_SELECTION_CLIPBOARD : GDK_SELECTION_PRIMARY;
+		GtkClipboard *clipboard = gtk_clipboard_get(atom);
+		gtk_clipboard_set_image(clipboard, imageRef);
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@
 
 	shared_ptr<ZLDialog> createDialog(const ZLResourceKey &key) const;
 	shared_ptr<ZLOptionsDialog> createOptionsDialog(const ZLResourceKey &key, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const;
-	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	void informationBox(const std::string &title, const std::string &message) const;
 	void errorBox(const ZLResourceKey &key, const std::string &message) const;
 	int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const;
 	bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const;
@@ -48,6 +48,7 @@
 
 	bool isClipboardSupported(ClipboardType type) const;
 	void setClipboardText(const std::string &text, ClipboardType type) const;
+	void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const;
 
 	void setMainWindow(GtkWindow *window) const { myIsInitialized = true; myWindow = window; }
 
@@ -59,9 +60,11 @@
 	mutable GtkWindow *myWindow;
 	bool myIsKeyboardGrabbed;
 
-	mutable bool myIsWaiting;
+	volatile mutable bool myIsWaiting;
 
 friend GtkDialog *createGtkDialog(const std::string &caption);
+
+friend class ZLMaemoNetworkManager;
 };
 
 #endif /* __ZLGTKDIALOGMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/dialogs/ZLGtkUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,11 @@
  */
 
 #include <gtk/gtk.h>
+#include <stdlib.h>
 
 #include <ZLApplication.h>
 #include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 #include <ZLFile.h>
 #include <ZLDir.h>
 
@@ -34,6 +36,9 @@
 #include "../message/ZLMaemoMessage.h"
 #include "../../../../core/src/unix/xmlconfig/XMLConfig.h"
 #include "../../../../core/src/unix/iconv/IConvEncodingConverter.h"
+#if MAEMO_VERSION > 2
+#include "../network/ZLMaemoNetworkManager.h"
+#endif
 
 class ZLGtkLibraryImplementation : public ZLibraryImplementation {
 
@@ -58,6 +63,9 @@
 	ZLGtkDialogManager::createInstance();
 	ZLMaemoCommunicationManager::createInstance();
 	ZLGtkImageManager::createInstance();
+#if MAEMO_VERSION > 2
+	ZLMaemoNetworkManager::createInstance();
+#endif
 
 	if (!ZLFile("/usr/lib/more-gconv").directory(false).isNull()) {
 		setenv("GCONV_PATH", "/usr/lib/more-gconv", 1);
@@ -72,7 +80,7 @@
 void ZLGtkLibraryImplementation::run(ZLApplication *application) {
 	ZLDialogManager::instance().createApplicationWindow(application);
 	application->initWindow();
+	gtk_widget_set_default_direction(ZLLanguageUtil::isRTLLanguage(ZLibrary::Language()) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
 	gtk_main();
 	delete application;
-	pthread_exit(0);
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/message/ZLMaemoMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/message/ZLMaemoMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/message/ZLMaemoMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/message/ZLMaemoMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/message/ZLMaemoMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/message/ZLMaemoMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/message/ZLMaemoMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/message/ZLMaemoMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <gtk/gtk.h>
+
+#include <ZLStringUtil.h>
+
+#include "ZLMaemoNetworkManager.h"
+#include "../dialogs/ZLGtkDialogManager.h"
+
+void ZLMaemoNetworkManager::createInstance() {
+	ourInstance = new ZLMaemoNetworkManager();
+}
+
+static void connectionEventHandler(ConIcConnection*, ConIcConnectionEvent *event, ZLMaemoNetworkManager *connectionManager) {
+	connectionManager->onStatusChanged(con_ic_connection_event_get_status(event));
+}
+
+void ZLMaemoNetworkManager::onStatusChanged(ConIcConnectionStatus status) {
+	switch(status) {
+		case CON_IC_STATUS_CONNECTED:
+			myConnectionStatus = CONNECTED;
+			break;
+		case CON_IC_STATUS_DISCONNECTING:
+		case CON_IC_STATUS_DISCONNECTED:
+			myConnectionStatus = FAILED;
+			break;
+	}
+}
+
+ZLMaemoNetworkManager::ZLMaemoNetworkManager() {
+	myConnection = con_ic_connection_new();
+	g_signal_connect(G_OBJECT(myConnection), "connection-event", G_CALLBACK(connectionEventHandler), this);
+}
+
+ZLMaemoNetworkManager::~ZLMaemoNetworkManager() {
+	g_object_unref(myConnection);
+}
+
+bool ZLMaemoNetworkManager::connect() const {
+	volatile bool &waitingFlag = ((ZLGtkDialogManager&)ZLGtkDialogManager::instance()).myIsWaiting;
+	waitingFlag = true;
+	myConnectionStatus = IN_PROGRESS;
+	con_ic_connection_connect(myConnection, CON_IC_CONNECT_FLAG_UNMANAGED);
+	while (myConnectionStatus == IN_PROGRESS) {
+		gtk_main_iteration();
+	}
+	waitingFlag = false;
+	return myConnectionStatus == CONNECTED;
+}
+
+void ZLMaemoNetworkManager::release() const {
+}
+
+bool ZLMaemoNetworkManager::providesProxyInfo() const {
+	return true;
+}
+
+bool ZLMaemoNetworkManager::useProxy() const {
+	return
+		con_ic_connection_get_proxy_mode(myConnection) != CON_IC_PROXY_MODE_NONE;
+}
+
+std::string ZLMaemoNetworkManager::proxyHost() const {
+	const char *host = con_ic_connection_get_proxy_host(myConnection, CON_IC_PROXY_PROTOCOL_HTTP);
+	return (host != 0) ? host : std::string();
+}
+
+std::string ZLMaemoNetworkManager::proxyPort() const {
+	int port = con_ic_connection_get_proxy_port(myConnection, CON_IC_PROXY_PROTOCOL_HTTP);
+	std::string portString;
+	ZLStringUtil::appendNumber(portString, port);
+	return portString;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/network/ZLMaemoNetworkManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLMAEMONETWORKMANAGER_H__
+#define __ZLMAEMONETWORKMANAGER_H__
+
+#include <conic.h>
+
+#include <ZLNetworkManager.h>
+
+class ZLMaemoNetworkManager : public ZLNetworkManager {
+
+public:
+	static void createInstance();
+
+private:
+	ZLMaemoNetworkManager();
+	~ZLMaemoNetworkManager();
+
+public:
+	void onStatusChanged(ConIcConnectionStatus status);
+
+private:
+	bool connect() const;
+	void release() const;
+
+	bool providesProxyInfo() const;
+
+	bool useProxy() const;
+	std::string proxyHost() const;
+	std::string proxyPort() const;
+
+private:
+	mutable ConIcConnection *myConnection;
+	mutable volatile enum {
+		CONNECTED,
+		FAILED,
+		IN_PROGRESS
+	} myConnectionStatus;
+};
+
+#endif /* __ZLMAEMONETWORKMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#if MAEMO_VERSION == 2
+#if MAEMO_VERSION <= 3
 	#include <hildon-controlbar.h>
 	#include <hildon-number-editor.h>
 #elif MAEMO_VERSION == 4
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/optionView/ZLGtkOptionViewHolder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/time/ZLGtkTime.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/time/ZLGtkTime.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/time/ZLGtkTime.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/time/ZLGtkTime.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/time/ZLGtkTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/time/ZLGtkTime.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/time/ZLGtkTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/time/ZLGtkTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,7 +44,6 @@
 
 ZLGtkPaintContext::ZLGtkPaintContext() {
 	myPixmap = 0;
-	myTilePixmap = 0;
 	myWidth = 0;
 	myHeight = 0;
 
@@ -61,6 +60,8 @@
 	myFillGC = 0;
 	myBackGC = 0;
 
+	myTilePixmap = 0;
+
 	myStringHeight = -1;
 	mySpaceWidth = -1;
 	myDescent = 0;
@@ -88,8 +89,6 @@
 
 void ZLGtkPaintContext::updatePixmap(GtkWidget *area, int w, int h) {
 	if ((myPixmap != 0) && ((myWidth != w) || (myHeight != h))) {
-		gdk_pixmap_unref(myPixmap);
-		myPixmap = 0;
 		if (myTextGC != 0) {
 			gdk_gc_unref(myTextGC);
 			gdk_gc_unref(myFillGC);
@@ -98,6 +97,8 @@
 			myFillGC = 0;
 			myBackGC = 0;
 		}
+		gdk_pixmap_unref(myPixmap);
+		myPixmap = 0;
 	}
 
 	if (myPixmap == 0) {
@@ -226,7 +227,7 @@
 	}
 }
 
-int ZLGtkPaintContext::stringWidth(const char *str, int len) const {
+int ZLGtkPaintContext::stringWidth(const char *str, int len, bool rtl) const {
 	if (myContext == 0) {
 		return 0;
 	}
@@ -235,6 +236,7 @@
 		return 0;
 	}
 
+	myAnalysis.level = rtl ? 1 : 0;
 	pango_shape(str, len, &myAnalysis, myString);
 	PangoRectangle logicalRectangle;
 	pango_glyph_string_extents(myString, myAnalysis.font, 0, &logicalRectangle);
@@ -243,7 +245,7 @@
 
 int ZLGtkPaintContext::spaceWidth() const {
 	if (mySpaceWidth == -1) {
-		mySpaceWidth = stringWidth(" ", 1);
+		mySpaceWidth = stringWidth(" ", 1, false);
 	}
 	return mySpaceWidth;
 }
@@ -262,11 +264,12 @@
 	return myDescent;
 }
 
-void ZLGtkPaintContext::drawString(int x, int y, const char *str, int len) {
+void ZLGtkPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
 	if (!g_utf8_validate(str, len, 0)) {
 		return;
 	}
 
+	myAnalysis.level = rtl ? 1 : 0;
 	pango_shape(str, len, &myAnalysis, myString);
 	gdk_draw_glyphs(myPixmap, myTextGC, myAnalysis.font, x, y, myString);
 }
@@ -341,3 +344,5 @@
 	}
 	return myHeight;
 }
+
+// vim:ts=2:sw=2:noet
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,11 +47,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
@@ -63,9 +63,9 @@
 	GdkPixmap *myPixmap;
 	int myWidth, myHeight;
 
-  PangoContext *myContext;
+	PangoContext *myContext;
 
-  PangoFontDescription *myFontDescription;
+	PangoFontDescription *myFontDescription;
 	mutable PangoAnalysis myAnalysis;
 	PangoGlyphString *myString;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,28 +18,31 @@
  */
 
 #include <ZLOptions.h>
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 
 #include "../dialogs/ZLGtkOptionsDialog.h"
 #include "ZLGtkViewWidget.h"
 #include "ZLGtkPaintContext.h"
 #include "../../gtk/pixbuf/ZLGtkPixbufHack.h"
+#include "../../gtk/util/ZLGtkSignalUtil.h"
 
 void ZLGtkViewWidget::updateCoordinates(int &x, int &y) {
 	switch (rotation()) {
 		default:
 			break;
-		case ZLViewWidget::DEGREES90:
+		case ZLView::DEGREES90:
 		{
 			int tmp = x;
 			x = height() - y;
 			y = tmp;
 			break;
 		}
-		case ZLViewWidget::DEGREES180:
+		case ZLView::DEGREES180:
 			x = width() - x;
 			y = height() - y;
 			break;
-		case ZLViewWidget::DEGREES270:
+		case ZLView::DEGREES270:
 		{
 			int tmp = x;
 			x = y;
@@ -50,7 +53,7 @@
 }
 
 bool ZLGtkViewWidget::isStylusEvent(GtkWidget *widget, GdkEventButton *event) {
-#if MAEMO_VERSION == 2
+#if MAEMO_VERSION <= 3
 	if (event->button == 8) {
 		return false;
 	}
@@ -135,7 +138,76 @@
 
 static const std::string GROUP = "StylusPressure";
 
-ZLGtkViewWidget::ZLGtkViewWidget(ZLApplication *application, Angle initialAngle) :
+bool ZLGtkViewWidget::scrollbarEvent(ZLView::Direction direction, GtkRange *range, GtkScrollType type, double newValue) {
+	static bool alreadyProcessed = false;
+	if (alreadyProcessed) {
+		return true;
+	}
+	alreadyProcessed = true;
+
+	bool code = true;
+	switch (type) {
+		default:
+			code = false;
+			break;
+  	case GTK_SCROLL_JUMP:
+		{
+			GtkAdjustment *adjustment = gtk_range_get_adjustment(range);
+			const int upper = (int)adjustment->upper;
+			onScrollbarMoved(
+				direction,
+				upper,
+				std::max(std::min((int)newValue, upper), 0),
+				std::max(std::min((int)(newValue + adjustment->page_size), upper), 0)
+			);
+			code = false;
+			break;
+		}
+  	case GTK_SCROLL_STEP_BACKWARD:
+			onScrollbarStep(direction, -1);
+			break;
+  	case GTK_SCROLL_STEP_FORWARD:
+			onScrollbarStep(direction, 1);
+			break;
+  	case GTK_SCROLL_PAGE_BACKWARD:
+			onScrollbarPageStep(direction, -1);
+			break;
+  	case GTK_SCROLL_PAGE_FORWARD:
+			onScrollbarPageStep(direction, 1);
+			break;
+	}
+	gtk_widget_send_expose(myArea, gdk_event_new(GDK_EXPOSE));
+	alreadyProcessed = false;
+	return code;
+}
+
+static bool vScrollbarEvent(GtkRange *range, GtkScrollType type, double newValue, ZLGtkViewWidget *data) {
+	return data->scrollbarEvent(ZLView::VERTICAL, range, type, newValue);
+}
+
+static bool hScrollbarEvent(GtkRange *range, GtkScrollType type, double newValue, ZLGtkViewWidget *data) {
+	return data->scrollbarEvent(ZLView::HORIZONTAL, range, type, newValue);
+}
+
+GtkWidget *ZLGtkViewWidget::createVScrollbar(int pos) {
+	GtkWidget *vScrollbar = gtk_vscrollbar_new(myVerticalAdjustment);
+	gtk_range_set_update_policy(GTK_RANGE(vScrollbar), GTK_UPDATE_CONTINUOUS);
+	gtk_table_attach(myTable, vScrollbar, pos, pos + 1, 1, 2, GTK_FILL, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(vScrollbar), "change_value", GTK_SIGNAL_FUNC(vScrollbarEvent), this);
+	gtk_widget_hide(vScrollbar);
+	return vScrollbar;
+}
+
+GtkWidget *ZLGtkViewWidget::createHScrollbar(int pos) {
+	GtkWidget *hScrollbar = gtk_hscrollbar_new(myHorizontalAdjustment);
+	gtk_range_set_update_policy(GTK_RANGE(hScrollbar), GTK_UPDATE_CONTINUOUS);
+	gtk_table_attach(myTable, hScrollbar, 1, 2, pos, pos + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), GTK_FILL, 0, 0);
+	ZLGtkSignalUtil::connectSignal(GTK_OBJECT(hScrollbar), "change_value", GTK_SIGNAL_FUNC(hScrollbarEvent), this);
+	gtk_widget_hide(hScrollbar);
+	return hScrollbar;
+}
+
+ZLGtkViewWidget::ZLGtkViewWidget(ZLApplication *application, ZLView::Angle initialAngle) :
 	ZLViewWidget(initialAngle),
 	MinPressureOption(ZLCategoryKey::CONFIG, GROUP, "Minimum", 0, 100, 0),
 	MaxPressureOption(ZLCategoryKey::CONFIG, GROUP, "Maximum", 0, 100, 40) {
@@ -145,11 +217,90 @@
 	myOriginalPixbuf = 0;
 	myRotatedPixbuf = 0;
 	GTK_OBJECT_SET_FLAGS(myArea, GTK_CAN_FOCUS);
+
+	myTable = GTK_TABLE(gtk_table_new(3, 3, false));
+	gtk_table_attach(myTable, myArea, 1, 2, 1, 2, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), 0, 0);
+	gtk_widget_show(GTK_WIDGET(myTable));
+	gtk_widget_show(myArea);
+
+	myVerticalAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new(100, 0, 100, 1, 1, 1));
+	myShowScrollBarAtRight = true;
+	myVerticalScrollbarIsVisible = false;
+	myLeftScrollBar = createVScrollbar(0);
+	myRightScrollBar = createVScrollbar(2);
+
+	myHorizontalAdjustment = GTK_ADJUSTMENT(gtk_adjustment_new(100, 0, 100, 1, 1, 1));
+	myShowScrollBarAtBottom = true;
+	myHorizontalScrollbarIsVisible = false;
+	myTopScrollBar = createHScrollbar(0);
+	myBottomScrollBar = createHScrollbar(2);
+
 	gtk_widget_set_double_buffered(myArea, false);
 	gtk_widget_set_events(myArea, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
 	gtk_widget_set_extension_events(myArea, GDK_EXTENSION_EVENTS_CURSOR);
 }
 
+void ZLGtkViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+	GtkWidget *scrollbar = (direction == ZLView::VERTICAL) ?
+		(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar) :
+		(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+
+	if (direction == ZLView::VERTICAL) {
+		myVerticalScrollbarIsVisible = enabled;
+	} else {
+		myHorizontalScrollbarIsVisible = enabled;
+	}
+
+	if (enabled) {
+		gtk_widget_show(scrollbar);
+		gtk_widget_queue_draw(scrollbar);
+	} else {
+		gtk_widget_hide(scrollbar);
+	}
+}
+
+void ZLGtkViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+	if ((rotation() == ZLView::DEGREES90) || (rotation() == ZLView::DEGREES270)) {
+		if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+			standard = !standard;
+		}
+	}
+
+	if (direction == ZLView::VERTICAL) {
+		if (myVerticalScrollbarIsVisible) {
+			gtk_widget_hide(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar);
+		}
+		myShowScrollBarAtRight = standard;
+		if (myVerticalScrollbarIsVisible) {
+			gtk_widget_show(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar);
+		}
+	} else {
+		if (myHorizontalScrollbarIsVisible) {
+			gtk_widget_hide(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+		}
+		myShowScrollBarAtBottom = standard;
+		if (myHorizontalScrollbarIsVisible) {
+			gtk_widget_show(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+		}
+	}
+}
+
+void ZLGtkViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	GtkAdjustment *adjustment =
+		(direction == ZLView::VERTICAL) ? myVerticalAdjustment : myHorizontalAdjustment;
+	adjustment->lower = 0;
+	adjustment->upper = full;
+	adjustment->value = from;
+	adjustment->step_increment = to - from;
+	adjustment->page_increment = to - from;
+	adjustment->page_size = to - from;
+
+	GtkWidget *scrollbar = (direction == ZLView::VERTICAL) ?
+		(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar) :
+		(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+	gtk_widget_queue_draw(scrollbar);
+}
+
 ZLGtkViewWidget::~ZLGtkViewWidget() {
 	cleanOriginalPixbuf();
 	cleanRotatedPixbuf();
@@ -180,8 +331,8 @@
 
 void ZLGtkViewWidget::doPaint()	{
 	ZLGtkPaintContext &gtkContext = (ZLGtkPaintContext&)view()->context();
-	Angle angle = rotation();
-	bool isRotated = (angle == DEGREES90) || (angle == DEGREES270);
+	ZLView::Angle angle = rotation();
+	bool isRotated = (angle == ZLView::DEGREES90) || (angle == ZLView::DEGREES270);
 	int w = isRotated ? myArea->allocation.height : myArea->allocation.width;
 	int h = isRotated ? myArea->allocation.width : myArea->allocation.height;
 	gtkContext.updatePixmap(myArea, w, h);
@@ -190,10 +341,9 @@
 		default:
 			cleanOriginalPixbuf();
 			cleanRotatedPixbuf();
-			gdk_draw_pixmap(myArea->window, myArea->style->white_gc, gtkContext.pixmap(),
-											0, 0, 0, 0, myArea->allocation.width, myArea->allocation.height);
+			gdk_draw_pixmap(myArea->window, myArea->style->white_gc, gtkContext.pixmap(), 0, 0, 0, 0, myArea->allocation.width, myArea->allocation.height);
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			cleanRotatedPixbuf();
 			if ((myOriginalPixbuf != 0) &&
 					((gdk_pixbuf_get_width(myOriginalPixbuf) != w) ||
@@ -205,14 +355,12 @@
 				myImage = gdk_image_new(GDK_IMAGE_FASTEST, gdk_drawable_get_visual(gtkContext.pixmap()), w, h);
 			}
 			gdk_drawable_copy_to_image(gtkContext.pixmap(), myImage, 0, 0, 0, 0, w, h);
-			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()),
-																0, 0, 0, 0, w, h);
+			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()), 0, 0, 0, 0, w, h);
 			::rotate180(myOriginalPixbuf);
-			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myOriginalPixbuf,
-											0, 0, 0, 0, w, h, GDK_RGB_DITHER_NONE, 0, 0);
+			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myOriginalPixbuf, 0, 0, 0, 0, w, h, GDK_RGB_DITHER_NONE, 0, 0);
 			break;
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			if ((myOriginalPixbuf != 0) &&
 					((gdk_pixbuf_get_width(myOriginalPixbuf) != w) ||
 					 (gdk_pixbuf_get_height(myOriginalPixbuf) != h))) {
@@ -231,11 +379,17 @@
 				myRotatedPixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, false, 8, h, w);
 			}
 			gdk_drawable_copy_to_image(gtkContext.pixmap(), myImage, 0, 0, 0, 0, w, h);
-			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()),
-																0, 0, 0, 0, w, h);
-			::rotate90(myRotatedPixbuf, myOriginalPixbuf, angle == DEGREES90);
-			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myRotatedPixbuf,
-											0, 0, 0, 0, h, w, GDK_RGB_DITHER_NONE, 0, 0);
+			gdk_pixbuf_get_from_image(myOriginalPixbuf, myImage, gdk_drawable_get_colormap(gtkContext.pixmap()), 0, 0, 0, 0, w, h);
+			::rotate90(myRotatedPixbuf, myOriginalPixbuf, angle == ZLView::DEGREES90);
+			gdk_draw_pixbuf(myArea->window, myArea->style->white_gc, myRotatedPixbuf, 0, 0, 0, 0, h, w, GDK_RGB_DITHER_NONE, 0, 0);
 			break;
 	}
 }
+
+GtkWidget *ZLGtkViewWidget::area() {
+	return myArea;
+}
+
+GtkWidget *ZLGtkViewWidget::areaWithScrollbars() {
+	return GTK_WIDGET(myTable);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/maemo/view/ZLGtkViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include <ZLView.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
 #include <ZLApplication.h>
 
 class ZLMaemoSpecificOptions;
@@ -34,22 +34,34 @@
 	ZLIntegerRangeOption MaxPressureOption;
 
 public:
-	ZLGtkViewWidget(ZLApplication *application, Angle initialAngle);
+	ZLGtkViewWidget(ZLApplication *application, ZLView::Angle initialAngle);
 	~ZLGtkViewWidget();
 
 	int width() const;
 	int height() const;
 
-	GtkWidget *area() { return myArea; }
+	void doPaint();
+
+	GtkWidget *area();
+	GtkWidget *areaWithScrollbars();
+
+	bool scrollbarEvent(ZLView::Direction direction, GtkRange *range, GtkScrollType type, double newValue);
+
 	void onMousePressed(GdkEventButton *event);
 	void onMouseReleased(GdkEventButton *event);
 	void onMouseMoved(GdkEventMotion *event);
-	void doPaint();
 
 private:
 	void trackStylus(bool track);
 	void repaint();
 
+	GtkWidget *createVScrollbar(int pos);
+	GtkWidget *createHScrollbar(int pos);
+
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to);
+
 	void cleanOriginalPixbuf();
 	void cleanRotatedPixbuf();
 	void updateCoordinates(int &x, int &y);
@@ -58,10 +70,23 @@
 private:
 	ZLApplication *myApplication;
 	GtkWidget *myArea;
+	GtkTable *myTable;
 	GdkPixbuf *myOriginalPixbuf;
 	GdkPixbuf *myRotatedPixbuf;
 	GdkImage *myImage;
 
+	GtkAdjustment *myVerticalAdjustment;
+	GtkWidget *myRightScrollBar;
+	GtkWidget *myLeftScrollBar;
+	bool myShowScrollBarAtRight;
+	bool myVerticalScrollbarIsVisible;
+
+	GtkAdjustment *myHorizontalAdjustment;
+	GtkWidget *myBottomScrollBar;
+	GtkWidget *myTopScrollBar;
+	bool myShowScrollBarAtBottom;
+	bool myHorizontalScrollbarIsVisible;
+
 	ZLMaemoSpecificOptions *mySpecificOptions;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -94,11 +94,11 @@
 	}
 }
 
-void ZLQtApplicationWindow::addToolbarItem(shared_ptr<ZLApplication::Toolbar::Item>) {
+void ZLQtApplicationWindow::addToolbarItem(shared_ptr<ZLToolbar::Item>) {
 }
 
 void ZLQtApplicationWindow::refresh() {
-	const ZLApplication::Toolbar::ItemVector &items = application().toolbar().items();
+	const ZLToolbar::ItemVector &items = application().toolbar().items();
 
 	bool isVisibilityChanged = false;
 	if (myToolbarMask.size() != items.size()) {
@@ -107,50 +107,71 @@
 		myToolbarMask.assign(items.size(), false);
 	}
 	std::vector<bool>::iterator bt = myToolbarMask.begin();
-	for (ZLApplication::Toolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
-		if ((*it)->type() == ZLApplication::Toolbar::Item::BUTTON) {
-			const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it;
-			if (application().isActionVisible(button.actionId()) != *bt) {
-				*bt = !*bt;
-				isVisibilityChanged = true;
+	for (ZLToolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
+		switch ((*it)->type()) {
+			case ZLToolbar::Item::PLAIN_BUTTON:
+			case ZLToolbar::Item::MENU_BUTTON:
+			case ZLToolbar::Item::TOGGLE_BUTTON:
+			{
+				const ZLToolbar::AbstractButtonItem &button =
+					(const ZLToolbar::AbstractButtonItem&)**it;
+				if (application().isActionVisible(button.actionId()) != *bt) {
+					*bt = !*bt;
+					isVisibilityChanged = true;
+				}
+				++bt;
+				break;
 			}
-			++bt;
 		}
 	}
 	if (isVisibilityChanged) {
 		bt = myToolbarMask.begin();
 		centralWidget()->hide();
 		menuBar()->clear();
-		for (ZLApplication::Toolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
-			if ((*it)->type() == ZLApplication::Toolbar::Item::BUTTON) {
-				const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it;
-				if (*bt) {
-					const QPixmap &pixmap = Resource::loadPixmap((ZLUnicodeUtil::toLower(ZLibrary::ApplicationName()) + ZLibrary::FileNameDelimiter + button.iconName()).c_str());
-					const std::string &actionId = button.actionId();
-					std::map<std::string,int>::const_iterator iter = myActionIndices.find(actionId);
-					int actionIndex;
-					if (iter != myActionIndices.end()) {
-						actionIndex = iter->second;
-					} else {
-						actionIndex = myActionIndices.size() + 1;
-						myActionIndices[actionId] = actionIndex;
-						myActionIds[actionIndex] = actionId;
+		for (ZLToolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
+			switch ((*it)->type()) {
+				case ZLToolbar::Item::PLAIN_BUTTON:
+				case ZLToolbar::Item::MENU_BUTTON:
+				case ZLToolbar::Item::TOGGLE_BUTTON:
+				{
+					const ZLToolbar::AbstractButtonItem &button =
+						(const ZLToolbar::AbstractButtonItem&)**it;
+					if (*bt) {
+						const QPixmap &pixmap = Resource::loadPixmap((ZLUnicodeUtil::toLower(ZLibrary::ApplicationName()) + ZLibrary::FileNameDelimiter + button.iconName()).c_str());
+						const std::string &actionId = button.actionId();
+						std::map<std::string,int>::const_iterator iter = myActionIndices.find(actionId);
+						int actionIndex;
+						if (iter != myActionIndices.end()) {
+							actionIndex = iter->second;
+						} else {
+							actionIndex = myActionIndices.size() + 1;
+							myActionIndices[actionId] = actionIndex;
+							myActionIds[actionIndex] = actionId;
+						}
+						menuBar()->insertItem(pixmap, this, SLOT(emptySlot()), 0, actionIndex);
 					}
-					menuBar()->insertItem(pixmap, this, SLOT(emptySlot()), 0, actionIndex);
+					++bt;
+					break;
 				}
-				++bt;
 			}
 		}
 		centralWidget()->show();
 	}
 
-	for (ZLApplication::Toolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
-		if ((*it)->type() == ZLApplication::Toolbar::Item::BUTTON) {
-			const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it;
-			const std::string &actionId = button.actionId();
-			const int id = myActionIndices[actionId];
-			if (menuBar()->findItem(id) != 0) {
-				menuBar()->setItemEnabled(id, application().isActionEnabled(actionId));
+	for (ZLToolbar::ItemVector::const_iterator it = items.begin(); it != items.end(); ++it) {
+		switch ((*it)->type()) {
+			case ZLToolbar::Item::PLAIN_BUTTON:
+			case ZLToolbar::Item::MENU_BUTTON:
+			case ZLToolbar::Item::TOGGLE_BUTTON:
+			{
+				const ZLToolbar::AbstractButtonItem &button =
+					(const ZLToolbar::AbstractButtonItem&)**it;
+				const std::string &actionId = button.actionId();
+				const int id = myActionIndices[actionId];
+				if (menuBar()->findItem(id) != 0) {
+					menuBar()->setItemEnabled(id, application().isActionEnabled(actionId));
+				}
+				break;
 			}
 		}
 	}
@@ -187,3 +208,9 @@
 	myCloseFlag = true;
 	QMainWindow::close();
 }
+
+void ZLQtApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+}
+
+void ZLQtApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/application/ZLQtApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 
 private:
 	ZLViewWidget *createViewWidget();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void refresh();
 	void close();
 
@@ -53,6 +53,9 @@
 	void closeEvent(QCloseEvent *event);
 	void keyPressEvent(QKeyEvent *event);
 
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
+
 private slots:
 	void doActionSlot(int buttonNumber);
 	void emptySlot() {}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLFullScreenDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/dialogs/ZLQtWaitMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <fribidi/fribidi.h>
+
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qfontmetrics.h>
@@ -24,6 +26,7 @@
 #include <qimage.h>
 
 #include <ZLImage.h>
+#include <ZLUnicodeUtil.h>
 
 #include "ZLQtPaintContext.h"
 #include "../../qt/image/ZLQtImageManager.h"
@@ -145,7 +148,7 @@
 	));
 }
 
-int ZLQtPaintContext::stringWidth(const char *str, int len) const {
+int ZLQtPaintContext::stringWidth(const char *str, int len, bool) const {
 	return myPainter->fontMetrics().width(QString::fromUtf8(str, len));
 }
 
@@ -164,9 +167,22 @@
 	return myPainter->font().pointSize() + 2;
 }
 
-void ZLQtPaintContext::drawString(int x, int y, const char *str, int len) {
-	QString qStr = QString::fromUtf8(str, len);
-	myPainter->drawText(x, y, qStr);
+void ZLQtPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
+	if (rtl) {
+		static ZLUnicodeUtil::Ucs2String ucs2Str;
+		ucs2Str.clear();
+		ZLUnicodeUtil::utf8ToUcs2(ucs2Str, str, len);
+		QString qStr;
+		FriBidiChar ch;
+		for (int i = ucs2Str.size() - 1; i >= 0; --i) {
+			fribidi_get_mirror_char(ucs2Str[i], &ch);
+			qStr.append(QChar(ch));
+		}
+		myPainter->drawText(x, y, qStr);
+	} else {
+		QString qStr = QString::fromUtf8(str, len);
+		myPainter->drawText(x, y, qStr);
+	}
 }
 
 void ZLQtPaintContext::drawImage(int x, int y, const ZLImageData &image) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,11 +48,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 	setBackgroundMode(NoBackground);
 }
 
-ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLApplication *application) : ZLViewWidget((ZLViewWidget::Angle)application->AngleStateOption.value()), myApplication(application) {
+ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLApplication *application) : ZLViewWidget((ZLView::Angle)application->AngleStateOption.value()), myApplication(application) {
 	myQWidget = new ZLQtViewWidgetInternal(parent, *this);
 }
 
@@ -46,8 +46,8 @@
 		default:
 			((ZLQtPaintContext&)myHolder.view()->context()).setSize(w, h);
 			break;
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			((ZLQtPaintContext&)myHolder.view()->context()).setSize(h, w);
 			break;
 	}
@@ -57,13 +57,13 @@
 	switch (myHolder.rotation()) {
 		default:
 			break;
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			angle = 270;
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			angle = 180;
 			break;
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			angle = 90;
 			break;
 	}
@@ -106,11 +106,11 @@
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return std::min(std::max(event->y(), 0), maxY);
 	}
 }
@@ -121,11 +121,11 @@
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->y(), 0), maxY);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
 	}
 }
@@ -133,3 +133,12 @@
 void ZLQtViewWidget::repaint()	{
 	myQWidget->repaint(false);
 }
+
+void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+}
+
+void ZLQtViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+}
+
+void ZLQtViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to, size_t step) {
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/opie/view/ZLQtViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/opie/view/ZLQtViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
 
 #include <qwidget.h>
 
-#include <ZLView.h>
 #include <ZLApplication.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
 
 class ZLQtViewWidget : public ZLViewWidget {
 
@@ -54,6 +54,10 @@
 	void repaint();
 	void trackStylus(bool track);
 
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to, size_t step);
+
 private:
 	ZLQtViewWidgetInternal *myQWidget;
 	ZLApplication *myApplication;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/moc.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/moc.mk
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/moc.mk	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/moc.mk	2009-04-30 22:26:45.000000000 +0100
@@ -1 +1 @@
-SRCMOC = ZLQtApplicationWindow.moc.cpp
+SRCMOC = ZLQtApplicationWindow.moc.cpp ZLQtPopupMenu.moc.cpp
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,10 +24,13 @@
 #include <qaction.h>
 #include <qlayout.h>
 #include <qobjectlist.h>
+#include <qtooltip.h>
 
 #include <ZLibrary.h>
+#include <ZLPopupData.h>
 
 #include "ZLQtApplicationWindow.h"
+#include "ZLQtPopupMenu.h"
 #include "../dialogs/ZLQtDialogManager.h"
 #include "../view/ZLQtViewWidget.h"
 #include "../util/ZLQtKeyUtil.h"
@@ -73,24 +76,35 @@
 	return new QPixmap(image);
 }
 
-ZLQtToolBarAction::ZLQtToolBarAction(ZLQtApplicationWindow *parent, ZLApplication::Toolbar::ButtonItem &item) : QAction(parent), myItem(item) {
+ZLQtToolButton::ZLQtToolButton(ZLQtApplicationWindow &window, ZLToolbar::AbstractButtonItem &item) : QToolButton(window.myToolBar), myWindow(window), myItem(item) {
 	static std::string imagePrefix = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
 	QPixmap icon((imagePrefix + myItem.iconName() + ".png").c_str());
 	setIconSet(QIconSet(icon));
 	QSize size = icon.size();
 	QIconSet::setIconSize(QIconSet::Large, size);
 	QIconSet::setIconSize(QIconSet::Small, size);
-	setToggleAction(item.isToggleButton());
-	setToolTip(QString::fromUtf8(myItem.tooltip().c_str()));
-	connect(this, SIGNAL(activated()), this, SLOT(onActivated()));
+	if (item.type() == ZLToolbar::Item::TOGGLE_BUTTON) {
+		setToggleButton(true);
+	} else if (item.type() == ZLToolbar::Item::MENU_BUTTON) {
+		ZLToolbar::MenuButtonItem &menuButtonItem = (ZLToolbar::MenuButtonItem&)myItem;
+		shared_ptr<ZLPopupData> popupData = menuButtonItem.popupData();
+		myWindow.myPopupIdMap[&menuButtonItem] =
+			popupData.isNull() ? (size_t)-1 : (popupData->id() - 1);
+		setPopup(new ZLQtPopupMenu(this));
+	}
+	QString text = QString::fromUtf8(myItem.tooltip().c_str());
+	setTextLabel(text);
+	setUsesTextLabel(false);
+	QToolTip::add(this, text);
+	connect(this, SIGNAL(clicked()), this, SLOT(onActivated()));
 }
 
-void ZLQtToolBarAction::onActivated() {
-	((ZLQtApplicationWindow*)parent())->onButtonPress(myItem);
+void ZLQtToolButton::onActivated() {
+	myWindow.onButtonPress(myItem);
 }
 
-void ZLQtApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	myActions[&button]->setOn(button.isPressed());
+void ZLQtApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	((QToolButton*)myItemToWidgetMap[&button])->setOn(button.isPressed());
 }
 
 ZLQtApplicationWindow::ZLQtApplicationWindow(ZLApplication *application) :
@@ -108,6 +122,7 @@
 	setWFlags(getWFlags() | WStyle_Customize);
 
 	myToolBar = new QToolBar(this);
+	myToolBar->setFocusPolicy(NoFocus);
 	myToolBar->boxLayout()->setMargin(5);
 	myToolBar->boxLayout()->setSpacing(3);
 	setToolBarsMovable(false);
@@ -134,6 +149,10 @@
 	}
 }
 
+void ZLQtApplicationWindow::processAllEvents() {
+	qApp->processEvents();
+}
+
 ZLQtApplicationWindow::~ZLQtApplicationWindow() {
 	if (isFullscreen()) {
 		myWindowStateOption.setValue(FULLSCREEN);
@@ -141,21 +160,15 @@
 		myWindowStateOption.setValue(MAXIMIZED);
 	} else {
 		myWindowStateOption.setValue(NORMAL);
-		QPoint position = pos();
-		if (position.x() != -1) {
-			myXOption.setValue(position.x());
+		if (x() != -1) {
+			myXOption.setValue(x());
 		}
-		if (position.y() != -1) {
-			myYOption.setValue(position.y());
+		if (y() != -1) {
+			myYOption.setValue(y());
 		}
 		myWidthOption.setValue(width());
 		myHeightOption.setValue(height());
 	}
-	for (std::map<const ZLApplication::Toolbar::Item*,ZLQtToolBarAction*>::iterator it = myActions.begin(); it != myActions.end(); ++it) {
-		if (it->second != 0) {
-			delete it->second;
-		}
-	}
 }
 
 void ZLQtApplicationWindow::setFullscreen(bool fullscreen) {
@@ -165,6 +178,16 @@
 	myFullScreen = fullscreen;
 	if (myFullScreen) {
 		myWasMaximized = isMaximized();
+		if (!myWasMaximized) {
+			if (x() != -1) {
+				myXOption.setValue(x());
+			}
+			if (y() != -1) {
+				myYOption.setValue(y());
+			}
+			myWidthOption.setValue(width());
+			myHeightOption.setValue(height());
+		}
 		myToolBar->hide();
 		showFullScreen();
 	} else {
@@ -172,6 +195,9 @@
 		showNormal();
 		if (myWasMaximized) {
 			showMaximized();
+		} else {
+			resize(myWidthOption.value(), myHeightOption.value());
+			move(myXOption.value(), myYOption.value());
 		}
 	}
 }
@@ -180,7 +206,7 @@
 	return myFullScreen;
 }
 
-void ZLQtApplicationWindow::keyPressEvent(QKeyEvent *event) {
+void ZLQtApplicationWindow::keyReleaseEvent(QKeyEvent *event) {
 	application().doActionByKey(ZLQtKeyUtil::keyName(event));
 }
 
@@ -202,33 +228,74 @@
 	}
 }
 
-void ZLQtApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	if (item->type() == ZLApplication::Toolbar::Item::BUTTON) {
-		ZLApplication::Toolbar::ButtonItem &buttonItem = (ZLApplication::Toolbar::ButtonItem&)*item;
-		ZLQtToolBarAction *action = new ZLQtToolBarAction(this, buttonItem);
-		action->addTo(myToolBar);
-		myActions[&*item] = action;
-	} else {
-		myToolBar->addSeparator();
-		mySeparatorMap[item] = (QWidget*)myToolBar->children()->getLast();
+ZLQtApplicationWindow::LineEditParameter::LineEditParameter(QToolBar *toolbar, ZLQtApplicationWindow &window, const ZLToolbar::TextFieldItem &textFieldItem) : QLineEdit(toolbar), myWindow(window), myActionId(textFieldItem.actionId()) {
+	setAlignment(Qt::AlignHCenter);
+	setFocusPolicy(ClickFocus);
+	setMaxLength(textFieldItem.maxWidth());
+	setMaximumWidth(textFieldItem.maxWidth() * 12 + 12);
+	QToolTip::add(this, QString::fromUtf8(textFieldItem.tooltip().c_str()));
+	myWindow.addVisualParameter(textFieldItem.parameterId(), this);
+}
+
+void ZLQtApplicationWindow::LineEditParameter::keyReleaseEvent(QKeyEvent *event) {
+	event->accept();
+	const std::string key = ZLQtKeyUtil::keyName(event);
+	if (key == "<Return>") {
+		myWindow.application().doAction(myActionId);
+		myWindow.setFocusToMainWidget();
+	} else if (key == "<Esc>") {
+		restoreOldValue();
+		myWindow.setFocusToMainWidget();
 	}
 }
 
-void ZLQtApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	QAction *action = myActions[&*item];
-	if (action != 0) {
-		action->setEnabled(enabled);
-		action->setVisible(visible);
-	} else {
-		QWidget *separator = mySeparatorMap[item];
-		if (separator != 0) {
-			separator->setShown(visible);
-		}
+std::string ZLQtApplicationWindow::LineEditParameter::internalValue() const {
+	return (const char*)text().utf8();
+}
+
+void ZLQtApplicationWindow::LineEditParameter::internalSetValue(const std::string &value) {
+	setText(QString::fromUtf8(value.c_str()));
+}
+
+void ZLQtApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr item) {
+	switch (item->type()) {
+		case ZLToolbar::Item::TEXT_FIELD:
+			myItemToWidgetMap[&*item] = new LineEditParameter(myToolBar, *this, (ZLToolbar::TextFieldItem&)*item);
+			break;
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+			myItemToWidgetMap[&*item] = new ZLQtToolButton(*this, (ZLToolbar::AbstractButtonItem&)*item);
+			break;
+		case ZLToolbar::Item::SEPARATOR:
+			myToolBar->addSeparator();
+			myItemToWidgetMap[&*item] = (QWidget*)myToolBar->children()->getLast();
+			break;
 	}
 }
 
-void ZLQtApplicationWindow::refresh() {
-	ZLApplicationWindow::refresh();
+void ZLQtApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	QWidget *widget = myItemToWidgetMap[&*item];
+	if (widget == 0) {
+		return;
+	}
+	widget->setEnabled(enabled);
+	widget->setShown(visible);
+
+	switch (item->type()) {
+		default:
+			break;
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			ZLToolbar::MenuButtonItem &menuButtonItem = (ZLToolbar::MenuButtonItem&)*item;
+			shared_ptr<ZLPopupData> data = menuButtonItem.popupData();
+			if (!data.isNull() && (data->id() != myPopupIdMap[&menuButtonItem])) {
+				myPopupIdMap[&menuButtonItem] = data->id();
+				((ZLQtPopupMenu*)((QToolButton*)widget)->popup())->reset(data);
+			}
+			break;
+		}
+	}
 }
 
 ZLQtViewWidgetPositionInfo::ZLQtViewWidgetPositionInfo(const ZLQtApplicationWindow &window) : myWindow(window) {
@@ -278,7 +345,11 @@
 	if (hyperlink) {
 		myStoredCursor = cursor();
 		setCursor(Qt::pointingHandCursor);
-	} else {
+	} else if (&myStoredCursor != &Qt::waitCursor) {
 		setCursor(myStoredCursor);
 	}
 }
+
+void ZLQtApplicationWindow::setFocusToMainWidget() {
+	centralWidget()->setFocus();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,8 +23,9 @@
 #include <map>
 
 #include <qmainwindow.h>
-#include <qaction.h>
+#include <qtoolbutton.h>
 #include <qcursor.h>
+#include <qlineedit.h>
 
 #include "../../../../core/src/desktop/application/ZLDesktopApplicationWindow.h"
 
@@ -35,11 +36,13 @@
 	ZLQtApplicationWindow(ZLApplication *application);
 	~ZLQtApplicationWindow();
 
+	void setFocusToMainWidget();
+
 private:
 	ZLViewWidget *createViewWidget();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void init();
-	void refresh();
+	void processAllEvents();
 	void close();
 
 	void grabAllKeys(bool grab);
@@ -52,18 +55,18 @@
 	void setFullscreen(bool fullscreen);
 
 	void closeEvent(QCloseEvent *event);
-	void keyPressEvent(QKeyEvent *event);
+	void keyReleaseEvent(QKeyEvent *event);
 	void wheelEvent(QWheelEvent *event);
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
 
 private:
 	class QToolBar *myToolBar;
 
-friend class ZLQtToolBarAction;
-	std::map<const ZLApplication::Toolbar::Item*, class ZLQtToolBarAction*> myActions;
-	std::map<ZLApplication::Toolbar::ItemPtr,QWidget*> mySeparatorMap;
+friend class ZLQtToolButton;
+	std::map<const ZLToolbar::Item*,QWidget*> myItemToWidgetMap;
+	std::map<const ZLToolbar::MenuButtonItem*,size_t> myPopupIdMap;
 
 	bool myFullScreen;
 	bool myWasMaximized;
@@ -72,19 +75,38 @@
 	QCursor myStoredCursor;
 
 friend class ZLQtViewWidgetPositionInfo;
+
+private:
+	class LineEditParameter : public QLineEdit, public VisualParameter {
+
+	public:
+		LineEditParameter(QToolBar *toolbar, ZLQtApplicationWindow &window, const ZLToolbar::TextFieldItem &textFieldItem);
+
+	private:
+		void keyReleaseEvent(QKeyEvent *event);
+
+		std::string internalValue() const;
+		void internalSetValue(const std::string &value);
+		void setValueList(const std::vector<std::string> &values) {}
+
+	private:
+		ZLQtApplicationWindow &myWindow;
+		const std::string &myActionId;
+	};
 };
 
-class ZLQtToolBarAction : public QAction {
+class ZLQtToolButton : public QToolButton {
 	Q_OBJECT
 
 public:
-	ZLQtToolBarAction(ZLQtApplicationWindow *parent, ZLApplication::Toolbar::ButtonItem &item);
+	ZLQtToolButton(ZLQtApplicationWindow &window, ZLToolbar::AbstractButtonItem &item);
 
 private slots:
 	void onActivated();
 
 private:
-	ZLApplication::Toolbar::ButtonItem &myItem;
+	ZLQtApplicationWindow &myWindow;
+	ZLToolbar::AbstractButtonItem &myItem;
 };
 
 #endif /* __ZLQTAPPLICATIONWINDOW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLQtPopupMenu.h"
+
+ZLQtPopupMenu::ZLQtPopupMenu(QWidget *parent) : QPopupMenu(parent) {
+	connect(this, SIGNAL(activated(int)), this, SLOT(onActivated(int)));
+}
+
+void ZLQtPopupMenu::onActivated(int itemId) {
+	if (!myPopupData.isNull()) {
+		myPopupData->run(myItemIdToIndex[itemId]);
+	}
+}
+
+void ZLQtPopupMenu::reset(shared_ptr<ZLPopupData> popupData) {
+	clear();
+	myItemIdToIndex.clear();
+	myPopupData = popupData;
+	if (!popupData.isNull()) {
+		const size_t count = popupData->count();
+		for (size_t i = 0; i < count; ++i) {
+			myItemIdToIndex[insertItem(QString::fromUtf8(popupData->text(i).c_str()))] = i;
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-desktop/ZLQtPopupMenu.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLQTPOPUPMENU_H__
+#define __ZLQTPOPUPMENU_H__
+
+#include <map>
+
+#include <qpopupmenu.h>
+
+#include <shared_ptr.h>
+#include <ZLPopupData.h>
+
+class ZLQtPopupMenu : public QPopupMenu {
+	Q_OBJECT
+
+public:
+	ZLQtPopupMenu(QWidget *parent);
+	void reset(shared_ptr<ZLPopupData> popupData);
+
+private slots:
+	void onActivated(int itemId);
+
+private:
+	shared_ptr<ZLPopupData> myPopupData;
+	std::map<int,int> myItemIdToIndex;
+};
+
+#endif /* __ZLQTPOPUPMENU_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/application-pdaxrom/ZLQtApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 #include "ZLQtWaitMessage.h"
 #include "ZLQtUtil.h"
 
+#include "../image/ZLQtImageManager.h"
+
 shared_ptr<ZLOptionsDialog> ZLQtDialogManager::createOptionsDialog(const ZLResourceKey &key, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const {
 	return new ZLQtOptionsDialog(resource()[key], applyAction, showApplyButton);
 }
@@ -38,10 +40,10 @@
 	return new ZLQtDialog(resource()[key]);
 }
 
-void ZLQtDialogManager::informationBox(const ZLResourceKey &key, const std::string &message) const {
+void ZLQtDialogManager::informationBox(const std::string &title, const std::string &message) const {
 	QMessageBox::information(
 		qApp->mainWidget(),
-		::qtString(dialogTitle(key)),
+		::qtString(title),
 		::qtString(message),
 		::qtButtonName(OK_BUTTON)
 	);
@@ -88,3 +90,10 @@
 		);
 	}
 }
+
+void ZLQtDialogManager::setClipboardImage(const ZLImageData &imageData, ClipboardType type) const {
+	qApp->clipboard()->setImage(
+		(ZLQtImageData&)imageData,
+		(type == CLIPBOARD_MAIN) ? QClipboard::Clipboard : QClipboard::Selection
+	);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 
 	shared_ptr<ZLDialog> createDialog(const ZLResourceKey &key) const;
 	shared_ptr<ZLOptionsDialog> createOptionsDialog(const ZLResourceKey &key, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const;
-	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	void informationBox(const std::string &title, const std::string &message) const;
 	void errorBox(const ZLResourceKey &key, const std::string &message) const;
 	int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const;
 	bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const;
@@ -43,6 +43,7 @@
 
 	bool isClipboardSupported(ClipboardType type) const;
 	void setClipboardText(const std::string &text, ClipboardType type) const;
+	void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const;
 };
 
 #endif /* __ZLQTDIALOGMANAGER_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,8 +56,10 @@
 	);
 
 	qApp->processEvents();
-	usleep(5000);
-	qApp->processEvents();
+	for (int i = 0; i < 6; ++i) {
+		usleep(5000);
+		qApp->processEvents();
+	}
 }
 
 ZLQtWaitMessage::~ZLQtWaitMessage() {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/dialogs/ZLQtWaitMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/filesystem/ZLQtFSManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/image/ZLQtImageManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/image/ZLQtImageManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/image/ZLQtImageManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/image/ZLQtImageManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/image/ZLQtImageManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/image/ZLQtImageManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/image/ZLQtImageManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/image/ZLQtImageManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include <ZLApplication.h>
 #include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 
 #include "../../../../core/src/unix/library/ZLibraryImplementation.h"
 
@@ -67,6 +68,7 @@
 }
 
 void ZLQtLibraryImplementation::run(ZLApplication *application) {
+	qApp->setReverseLayout(ZLLanguageUtil::isRTLLanguage(ZLibrary::Language()));
 	ZLDialogManager::instance().createApplicationWindow(application);
 	application->initWindow();
 	qApp->exec();
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/time/ZLQtTime.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/time/ZLQtTime.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/time/ZLQtTime.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/time/ZLQtTime.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/time/ZLQtTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/time/ZLQtTime.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/time/ZLQtTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/time/ZLQtTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/util/ZLQtKeyUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/util/ZLQtKeyUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/util/ZLQtKeyUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/util/ZLQtKeyUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/util/ZLQtKeyUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/util/ZLQtKeyUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/util/ZLQtKeyUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/util/ZLQtKeyUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/view/moc.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/moc.mk
--- fbreader-0.8.17/zlibrary/ui/src/qt/view/moc.mk	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/moc.mk	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+SRCMOC = ZLQtViewWidget.moc.cpp
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -145,7 +145,7 @@
 	));
 }
 
-int ZLQtPaintContext::stringWidth(const char *str, int len) const {
+int ZLQtPaintContext::stringWidth(const char *str, int len, bool) const {
 	return myPainter->fontMetrics().width(QString::fromUtf8(str, len));
 }
 
@@ -164,9 +164,9 @@
 	return myPainter->font().pointSize() + 2;
 }
 
-void ZLQtPaintContext::drawString(int x, int y, const char *str, int len) {
+void ZLQtPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
 	QString qStr = QString::fromUtf8(str, len);
-	myPainter->drawText(x, y, qStr);
+	myPainter->drawText(x, y, qStr, 0, len, rtl ? QPainter::RTL : QPainter::LTR);
 }
 
 void ZLQtPaintContext::drawImage(int x, int y, const ZLImageData &image) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,11 +47,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,62 @@
  * 02110-1301, USA.
  */
 
-#include "ZLQtViewWidget.h"
-#include "ZLQtPaintContext.h"
-
 #include <qpainter.h>
 #include <qpixmap.h>
+#include <qlayout.h>
+#include <qframe.h>
+#include <qscrollbar.h>
+
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
+
+#include "ZLQtViewWidget.h"
+#include "ZLQtPaintContext.h"
 
 ZLQtViewWidget::ZLQtViewWidgetInternal::ZLQtViewWidgetInternal(QWidget *parent, ZLQtViewWidget &holder) : QWidget(parent), myHolder(holder) {
 	setBackgroundMode(NoBackground);
+	setFocusPolicy(ClickFocus);
+}
+
+QScrollBar *ZLQtViewWidget::addScrollBar(QGridLayout *layout, Qt::Orientation orientation, int x, int y) {
+	QScrollBar *scrollBar = new QScrollBar(orientation, myFrame);
+	layout->addWidget(scrollBar, x, y);
+	scrollBar->hide();
+	if (orientation == Qt::Vertical) {
+		connect(scrollBar, SIGNAL(sliderMoved(int)), this, SLOT(onVerticalSliderMoved(int)));
+		connect(scrollBar, SIGNAL(nextLine()), this, SLOT(onVerticalSliderStepNext()));
+		connect(scrollBar, SIGNAL(nextPage()), this, SLOT(onVerticalSliderPageNext()));
+		connect(scrollBar, SIGNAL(prevLine()), this, SLOT(onVerticalSliderStepPrevious()));
+		connect(scrollBar, SIGNAL(prevPage()), this, SLOT(onVerticalSliderPagePrevious()));
+	} else {
+		connect(scrollBar, SIGNAL(sliderMoved(int)), this, SLOT(onHorizontalSliderMoved(int)));
+		connect(scrollBar, SIGNAL(nextLine()), this, SLOT(onHorizontalSliderStepNext()));
+		connect(scrollBar, SIGNAL(nextPage()), this, SLOT(onHorizontalSliderPageNext()));
+		connect(scrollBar, SIGNAL(prevLine()), this, SLOT(onHorizontalSliderStepPrevious()));
+		connect(scrollBar, SIGNAL(prevPage()), this, SLOT(onHorizontalSliderPagePrevious()));
+	}
+	return scrollBar;
 }
 
-ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLApplication *application, const ZLQtViewWidgetPositionInfo &positionInfo) : ZLViewWidget((ZLViewWidget::Angle)application->AngleStateOption.value()), myApplication(application), myPositionInfo(positionInfo) {
-	myQWidget = new ZLQtViewWidgetInternal(parent, *this);
+ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLApplication *application, const ZLQtViewWidgetPositionInfo &positionInfo) : ZLViewWidget((ZLView::Angle)application->AngleStateOption.value()), myApplication(application), myPositionInfo(positionInfo) {
+	myFrame = new QFrame(parent);
+	QGridLayout *layout = new QGridLayout(myFrame, 3, 3);
+	layout->setRowStretch(0, 0);
+	layout->setRowStretch(1, 1);
+	layout->setRowStretch(2, 0);
+	layout->setColStretch(0, 0);
+	layout->setColStretch(1, 1);
+	layout->setColStretch(2, 0);
+	myQWidget = new ZLQtViewWidgetInternal(myFrame, *this);
+  layout->addWidget(myQWidget, 1, 1);
+
+	myRightScrollBar = addScrollBar(layout, Qt::Vertical, 1, 2);
+	myLeftScrollBar = addScrollBar(layout, Qt::Vertical, 1, 0);
+	myShowScrollBarAtRight = true;
+
+	myBottomScrollBar = addScrollBar(layout, Qt::Horizontal, 2, 1);
+	myTopScrollBar = addScrollBar(layout, Qt::Horizontal, 0, 1);
+	myShowScrollBarAtBottom = true;
 }
 
 const ZLQtViewWidgetPositionInfo &ZLQtViewWidget::positionInfo() const {
@@ -45,8 +89,8 @@
 		default:
 			context.setSize(width(), height());
 			break;
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			context.setSize(height(), width());
 			break;
 	}
@@ -56,17 +100,17 @@
 		default:
 			realPainter.drawPixmap(0, 0, context.pixmap());
 			break;
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			realPainter.rotate(270);
 			realPainter.drawPixmap(1 - height(), -1, context.pixmap());
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			realPainter.rotate(180);
 			realPainter.drawPixmap(1 - width(), 1 - height(), context.pixmap());
 			break;
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			realPainter.rotate(90);
-			realPainter.drawPixmap(-1, 1 - width(), context.pixmap());
+			realPainter.drawPixmap(0, 1 - width(), context.pixmap());
 			break;
 	}
 }
@@ -99,11 +143,11 @@
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return std::min(std::max(event->y(), 0), maxY);
 	}
 }
@@ -114,11 +158,11 @@
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->y(), 0), maxY);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
 	}
 }
@@ -128,6 +172,7 @@
 }
 
 void ZLQtViewWidget::ZLQtViewWidgetInternal::resizeEvent(QResizeEvent*) {
+	/*
 	const ZLQtViewWidgetPositionInfo &info = myHolder.positionInfo();
 
 	const int x = info.x();
@@ -142,4 +187,121 @@
 	if ((width != this->width()) || (height != this->height())) {
 		resize(width, height);
 	}
+	*/
+}
+
+void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+	if (direction == ZLView::VERTICAL) {
+		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
+	} else {
+		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
+	}
+}
+
+void ZLQtViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+	if ((rotation() == ZLView::DEGREES90) || (rotation() == ZLView::DEGREES270)) {
+		if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+			standard = !standard;
+		}
+	}
+	if (direction == ZLView::VERTICAL) {
+		if (standard != myShowScrollBarAtRight) {
+			myShowScrollBarAtRight = standard;
+			QScrollBar *old = standard ? myLeftScrollBar : myRightScrollBar;
+			QScrollBar *current = standard ? myRightScrollBar : myLeftScrollBar;
+			if (old->isShown()) {
+				old->hide();
+				current->show();
+			}
+		}
+	} else {
+		if (standard != myShowScrollBarAtBottom) {
+			myShowScrollBarAtBottom = standard;
+			QScrollBar *old = standard ? myTopScrollBar : myBottomScrollBar;
+			QScrollBar *current = standard ? myBottomScrollBar : myTopScrollBar;
+			if (old->isShown()) {
+				old->hide();
+				current->show();
+			}
+		}
+	}
+}
+
+void ZLQtViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	QScrollBar *bar =
+		(direction == ZLView::VERTICAL) ?  verticalScrollBar() : horizontalScrollBar();
+	bar->setMinValue(0);
+	bar->setMaxValue(full + from - to);
+	bar->setValue(from);
+	bar->setPageStep(to - from);
+}
+
+QWidget *ZLQtViewWidget::widget() const {
+	return myFrame;
+}
+
+void ZLQtViewWidget::onVerticalSliderMoved(int value) {
+	QScrollBar *bar = verticalScrollBar();
+	size_t maxValue = bar->maxValue();
+	size_t pageStep = bar->pageStep();
+	onScrollbarMoved(
+		ZLView::VERTICAL,
+		maxValue + pageStep,
+		(size_t)value,
+		(size_t)value + pageStep
+	);
+}
+
+void ZLQtViewWidget::onVerticalSliderStepNext() {
+	onScrollbarStep(ZLView::VERTICAL, 1);
+}
+
+void ZLQtViewWidget::onVerticalSliderStepPrevious() {
+	onScrollbarStep(ZLView::VERTICAL, -1);
+}
+
+void ZLQtViewWidget::onVerticalSliderPageNext() {
+	onScrollbarPageStep(ZLView::VERTICAL, 1);
+}
+
+void ZLQtViewWidget::onVerticalSliderPagePrevious() {
+	onScrollbarPageStep(ZLView::VERTICAL, -1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderMoved(int value) {
+	QScrollBar *bar = horizontalScrollBar();
+	size_t maxValue = bar->maxValue();
+	size_t pageStep = bar->pageStep();
+	onScrollbarMoved(
+		ZLView::HORIZONTAL,
+		maxValue + pageStep,
+		(size_t)value,
+		(size_t)value + pageStep
+	);
+}
+
+void ZLQtViewWidget::onHorizontalSliderStepNext() {
+	onScrollbarStep(ZLView::HORIZONTAL, 1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderStepPrevious() {
+	onScrollbarStep(ZLView::HORIZONTAL, -1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderPageNext() {
+	onScrollbarPageStep(ZLView::HORIZONTAL, 1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderPagePrevious() {
+	onScrollbarPageStep(ZLView::HORIZONTAL, -1);
+}
+
+QScrollBar *ZLQtViewWidget::verticalScrollBar() {
+	return myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar;
+}
+
+QScrollBar *ZLQtViewWidget::horizontalScrollBar() {
+	return myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/qt/view/ZLQtViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt/view/ZLQtViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,13 @@
 
 #include <qwidget.h>
 
-#include <ZLView.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
 #include <ZLApplication.h>
 
 class ZLQtApplicationWindow;
+class QFrame;
+class QScrollBar;
+class QGridLayout;
 
 class ZLQtViewWidgetPositionInfo {
 
@@ -41,7 +44,8 @@
 	const ZLQtApplicationWindow &myWindow;
 };
 
-class ZLQtViewWidget : public ZLViewWidget {
+class ZLQtViewWidget : public QObject, public ZLViewWidget {
+	Q_OBJECT
 
 private:
 	class ZLQtViewWidgetInternal : public QWidget {
@@ -65,19 +69,47 @@
 	
 public:
 	ZLQtViewWidget(QWidget *parent, ZLApplication *application, const ZLQtViewWidgetPositionInfo &positionInfo);
-	QWidget *widget();
+	QWidget *widget() const;
 	const ZLQtViewWidgetPositionInfo &positionInfo() const;
 
 private:
 	void repaint();
 	void trackStylus(bool track);
 
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to);
+
+	QScrollBar *addScrollBar(QGridLayout *layout, Qt::Orientation orientation, int x, int y);
+	QScrollBar *verticalScrollBar();
+	QScrollBar *horizontalScrollBar();
+
+private slots:
+	void onVerticalSliderMoved(int value);
+	void onVerticalSliderStepNext();
+	void onVerticalSliderPageNext();
+	void onVerticalSliderStepPrevious();
+	void onVerticalSliderPagePrevious();
+	void onHorizontalSliderMoved(int value);
+	void onHorizontalSliderStepNext();
+	void onHorizontalSliderPageNext();
+	void onHorizontalSliderStepPrevious();
+	void onHorizontalSliderPagePrevious();
+
 private:
 	ZLQtViewWidgetInternal *myQWidget;
+	QFrame *myFrame;
+
+	QScrollBar *myRightScrollBar;
+	QScrollBar *myLeftScrollBar;
+	bool myShowScrollBarAtRight;
+
+	QScrollBar *myBottomScrollBar;
+	QScrollBar *myTopScrollBar;
+	bool myShowScrollBarAtBottom;
+
 	ZLApplication *myApplication;
 	const ZLQtViewWidgetPositionInfo myPositionInfo;
 };
 
-inline QWidget *ZLQtViewWidget::widget() { return myQWidget; }
-
 #endif /* __ZLQTVIEWWIDGET_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/application/LineEditParameter.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2008-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include <QtGui/QBoxLayout>
+#include <QtGui/QLineEdit>
+#include <QtGui/QToolBar>
+#include <QtGui/QKeyEvent>
+
+#include "ZLQtApplicationWindow.h"
+#include "../util/ZLQtKeyUtil.h"
+
+class ZLQtLineEdit : public QLineEdit {
+
+public:
+	ZLQtLineEdit(QToolBar *toolbar, ZLQtApplicationWindow &window, ZLQtApplicationWindow::LineEditParameter &parameter, const std::string &actionId);
+
+private:
+	void keyReleaseEvent(QKeyEvent *event);
+
+private:
+	ZLQtApplicationWindow &myWindow;
+	ZLQtApplicationWindow::LineEditParameter &myParameter;
+	const std::string myActionId;
+};
+
+ZLQtLineEdit::ZLQtLineEdit(QToolBar *toolbar, ZLQtApplicationWindow &window, ZLQtApplicationWindow::LineEditParameter &parameter, const std::string &actionId) : QLineEdit(toolbar), myWindow(window), myParameter(parameter), myActionId(actionId) {
+}
+
+void ZLQtLineEdit::keyReleaseEvent(QKeyEvent *event) {
+	event->accept();
+	const std::string key = ZLQtKeyUtil::keyName(event);
+	if (key == "<Return>") {
+		myWindow.application().doAction(myActionId);
+		myWindow.setFocusToMainWidget();
+	} else if (key == "<Esc>") {
+		myParameter.restoreOldValue();
+		myWindow.setFocusToMainWidget();
+	}
+}
+
+ZLQtApplicationWindow::LineEditParameter::LineEditParameter(QToolBar *toolbar, ZLQtApplicationWindow &window, const ZLToolbar::TextFieldItem &textFieldItem) {
+	myEdit = new ZLQtLineEdit(toolbar, window, *this, textFieldItem.actionId());
+	myEdit->setAlignment(Qt::AlignHCenter);
+	myEdit->setMaxLength(textFieldItem.maxWidth());
+	myEdit->setFixedWidth(textFieldItem.maxWidth() * 10 + 10);
+	myEdit->setFocusPolicy(Qt::ClickFocus);
+	myEdit->setToolTip(QString::fromUtf8(textFieldItem.tooltip().c_str()));
+	myAction = toolbar->addWidget(myEdit);
+	// I don't understand why this code does work but it does.
+	//QBoxLayout *layout = (QBoxLayout*)toolbar->layout();
+	//layout->addStretch();
+}
+
+QAction *ZLQtApplicationWindow::LineEditParameter::action() const {
+	return myAction;
+}
+
+std::string ZLQtApplicationWindow::LineEditParameter::internalValue() const {
+	return (const char*)myEdit->text().toUtf8();
+}
+
+void ZLQtApplicationWindow::LineEditParameter::internalSetValue(const std::string &value) {
+	myEdit->setText(QString::fromUtf8(value.c_str()));
+}
+
+void ZLQtApplicationWindow::LineEditParameter::restoreOldValue() {
+	VisualParameter::restoreOldValue();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,12 +23,15 @@
 #include <QtGui/QIcon>
 #include <QtGui/QToolBar>
 #include <QtGui/QMenuBar>
-#include <QtGui/QAction>
+#include <QtGui/QMenu>
+#include <QtGui/QToolButton>
 #include <QtGui/QLayout>
 #include <QtGui/QWheelEvent>
+#include <QtGui/QDockWidget>
 #include <QtCore/QObjectList>
 
 #include <ZLibrary.h>
+#include <ZLPopupData.h>
 
 #include "ZLQtApplicationWindow.h"
 #include "../dialogs/ZLQtDialogManager.h"
@@ -39,13 +42,17 @@
 	new ZLQtApplicationWindow(application);
 }
 
-ZLQtToolBarAction::ZLQtToolBarAction(ZLQtApplicationWindow *parent, ZLApplication::Toolbar::ButtonItem &item) : QAction(parent), myItem(item) {
+ZLQtToolBarAction::ZLQtToolBarAction(ZLQtApplicationWindow *parent, ZLToolbar::AbstractButtonItem &item) : QAction(parent), myItem(item) {
 	static std::string imagePrefix = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter;
 	QPixmap icon((imagePrefix + myItem.iconName() + ".png").c_str());
 	setIcon(QIcon(icon));
 	QSize size = icon.size();
-	setCheckable(item.isToggleButton());
-	setToolTip(QString::fromUtf8(myItem.tooltip().c_str()));
+	if (item.type() == ZLToolbar::Item::TOGGLE_BUTTON) {
+		setCheckable(true);
+	}
+	QString text = QString::fromUtf8(myItem.tooltip().c_str());
+	setText(text);
+	setToolTip(text);
 	connect(this, SIGNAL(triggered()), this, SLOT(onActivated()));
 }
 
@@ -53,26 +60,34 @@
 	((ZLQtApplicationWindow*)parent())->onButtonPress(myItem);
 }
 
-void ZLQtApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
+void ZLQtApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
 	myActions[&button]->setChecked(button.isPressed());
 }
 
 ZLQtApplicationWindow::ZLQtApplicationWindow(ZLApplication *application) :
 	ZLDesktopApplicationWindow(application),
+	myFullscreenToolBar(0),
+	myDocWidget(0),
 	myFullScreen(false),
 	myWasMaximized(false),
 	myCursorIsHyperlink(false) {
 
-	//const std::string iconFileName = ZLibrary::ImageDirectory() + ZLibrary::FileNameDelimiter + ZLibrary::ApplicationName() + ".png";
-	//QPixmap icon(iconFileName.c_str());
-	//setIcon(icon);
-
-	//setWFlags(getWFlags() | WStyle_Customize);
-
-	myToolBar = new QToolBar(this);
-	myToolBar->setMovable(false);
-	addToolBar(myToolBar);
-	myToolBar->setIconSize(QSize(32, 32));
+	const std::string iconFileName = ZLibrary::ImageDirectory() + ZLibrary::FileNameDelimiter + ZLibrary::ApplicationName() + ".png";
+	QPixmap icon(iconFileName.c_str());
+	setWindowIcon(icon);
+
+	myWindowToolBar = new QToolBar(this);
+	myWindowToolBar->setFocusPolicy(Qt::NoFocus);
+	myWindowToolBar->setMovable(false);
+	addToolBar(myWindowToolBar);
+	myWindowToolBar->setIconSize(QSize(32, 32));
+
+	if (hasFullscreenToolbar()) {
+		myFullscreenToolBar = new QToolBar();
+		myFullscreenToolBar->setMovable(false);
+		myFullscreenToolBar->setIconSize(QSize(32, 32));
+		myFullscreenToolBar->hide();
+	}
 
 	resize(myWidthOption.value(), myHeightOption.value());
 	move(myXOption.value(), myYOption.value());
@@ -112,7 +127,7 @@
 		myWidthOption.setValue(width());
 		myHeightOption.setValue(height());
 	}
-	for (std::map<const ZLApplication::Toolbar::Item*,QAction*>::iterator it = myActions.begin(); it != myActions.end(); ++it) {
+	for (std::map<const ZLToolbar::Item*,QAction*>::iterator it = myActions.begin(); it != myActions.end(); ++it) {
 		if (it->second != 0) {
 			delete it->second;
 		}
@@ -126,14 +141,30 @@
 	myFullScreen = fullscreen;
 	if (myFullScreen) {
 		myWasMaximized = isMaximized();
-		myToolBar->hide();
+		myWindowToolBar->hide();
 		showFullScreen();
+		if (myFullscreenToolBar != 0) {
+			if (myDocWidget == 0) {
+				myDocWidget = new QDockWidget(this);
+				myDocWidget->setWidget(myFullscreenToolBar);
+				myDocWidget->setFloating(true);
+				myDocWidget->setAllowedAreas(Qt::NoDockWidgetArea);
+			}
+			myDocWidget->show();
+			myFullscreenToolBar->show();
+			myDocWidget->setMinimumSize(myDocWidget->size());
+			myDocWidget->setMaximumSize(myDocWidget->size());
+		}
 	} else {
-		myToolBar->show();
+		myWindowToolBar->show();
 		showNormal();
 		if (myWasMaximized) {
 			showMaximized();
 		}
+		if (myDocWidget != 0) {
+			//myFullscreenToolBar->hide();
+			myDocWidget->hide();
+		}
 	}
 }
 
@@ -141,7 +172,7 @@
 	return myFullScreen;
 }
 
-void ZLQtApplicationWindow::keyPressEvent(QKeyEvent *event) {
+void ZLQtApplicationWindow::keyReleaseEvent(QKeyEvent *event) {
 	application().doActionByKey(ZLQtKeyUtil::keyName(event));
 }
 
@@ -163,28 +194,92 @@
 	}
 }
 
-void ZLQtApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	QAction *action;
-	if (item->type() == ZLApplication::Toolbar::Item::BUTTON) {
-		ZLApplication::Toolbar::ButtonItem &buttonItem = (ZLApplication::Toolbar::ButtonItem&)*item;
-		action = new ZLQtToolBarAction(this, buttonItem);
-		myToolBar->addAction(action);
-	} else {
-		action = myToolBar->addSeparator();
+void ZLQtApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr item) {
+	QToolBar *tb = toolbar(type(*item));
+	QAction *action = 0;
+
+	switch (item->type()) {
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+			action = new ZLQtToolBarAction(this, (ZLToolbar::AbstractButtonItem&)*item);
+			tb->addAction(action);
+			break;
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			ZLToolbar::MenuButtonItem &buttonItem = (ZLToolbar::MenuButtonItem&)*item;
+			QToolButton *button = new QToolButton(tb);
+			button->setFocusPolicy(Qt::NoFocus);
+			button->setDefaultAction(new ZLQtToolBarAction(this, buttonItem));
+			button->setMenu(new QMenu(button));
+			button->setPopupMode(QToolButton::MenuButtonPopup);
+			action = tb->addWidget(button);
+			myMenuButtons[&buttonItem] = button;
+			shared_ptr<ZLPopupData> popupData = buttonItem.popupData();
+			myPopupIdMap[&buttonItem] =
+				popupData.isNull() ? (size_t)-1 : (popupData->id() - 1);
+			break;
+		}
+		case ZLToolbar::Item::TEXT_FIELD:
+		{
+			ZLToolbar::TextFieldItem &textFieldItem =
+				(ZLToolbar::TextFieldItem&)*item;
+			LineEditParameter *para = new LineEditParameter(tb, *this, textFieldItem);
+			addVisualParameter(textFieldItem.parameterId(), para);
+			action = para->action();
+			break;
+		}
+		case ZLToolbar::Item::SEPARATOR:
+			action = tb->addSeparator();
+			break;
+	}
+
+	if (action != 0) {
+		myActions[&*item] = action;
 	}
-	myActions[&*item] = action;
 }
 
-void ZLQtApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
+ZLQtRunPopupAction::ZLQtRunPopupAction(QObject *parent, shared_ptr<ZLPopupData> data, size_t index) : QAction(parent), myData(data), myIndex(index) {
+	setText(QString::fromUtf8(myData->text(myIndex).c_str()));
+	connect(this, SIGNAL(triggered()), this, SLOT(onActivated()));
+}
+
+ZLQtRunPopupAction::~ZLQtRunPopupAction() {
+}
+
+void ZLQtRunPopupAction::onActivated() {
+	myData->run(myIndex);
+}
+
+void ZLQtApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
 	QAction *action = myActions[&*item];
 	if (action != 0) {
 		action->setEnabled(enabled);
 		action->setVisible(visible);
 	}
+	switch (item->type()) {
+		default:
+			break;
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			ZLToolbar::MenuButtonItem &buttonItem = (ZLToolbar::MenuButtonItem&)*item;
+			shared_ptr<ZLPopupData> data = buttonItem.popupData();
+			if (!data.isNull() && (data->id() != myPopupIdMap[&buttonItem])) {
+				myPopupIdMap[&buttonItem] = data->id();
+				QToolButton *button = myMenuButtons[&buttonItem];
+				QMenu *menu = button->menu();
+				menu->clear();
+				const size_t count = data->count();
+				for (size_t i = 0; i < count; ++i) {
+					menu->addAction(new ZLQtRunPopupAction(menu, data, i));
+				}
+			}
+			break;
+		}
+	}
 }
 
-void ZLQtApplicationWindow::refresh() {
-	ZLApplicationWindow::refresh();
+void ZLQtApplicationWindow::processAllEvents() {
+	qApp->processEvents();
 }
 
 ZLViewWidget *ZLQtApplicationWindow::createViewWidget() {
@@ -217,3 +312,7 @@
 		setCursor(myStoredCursor);
 	}
 }
+
+void ZLQtApplicationWindow::setFocusToMainWidget() {
+	centralWidget()->setFocus();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,13 @@
 #include <QtGui/QAction>
 #include <QtGui/QCursor>
 
+class QDockWidget;
+class QToolBar;
+class QToolButton;
+class QLineEdit;
+
+class ZLPopupData;
+
 #include "../../../../core/src/desktop/application/ZLDesktopApplicationWindow.h"
 
 class ZLQtApplicationWindow : public QMainWindow, public ZLDesktopApplicationWindow {
@@ -35,11 +42,13 @@
 	ZLQtApplicationWindow(ZLApplication *application);
 	~ZLQtApplicationWindow();
 
+	void setFocusToMainWidget();
+
 private:
 	ZLViewWidget *createViewWidget();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void init();
-	void refresh();
+	void processAllEvents();
 	void close();
 
 	void grabAllKeys(bool grab);
@@ -51,38 +60,77 @@
 	bool isFullscreen() const;
 	void setFullscreen(bool fullscreen);
 
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
+
 	void closeEvent(QCloseEvent *event);
-	void keyPressEvent(QKeyEvent *event);
+	void keyReleaseEvent(QKeyEvent *event);
 	void wheelEvent(QWheelEvent *event);
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
-
 private:
-	class QToolBar *myToolBar;
+	QToolBar *myWindowToolBar;
+	QToolBar *myFullscreenToolBar;
+	QDockWidget *myDocWidget;
+	QToolBar *toolbar(ToolbarType type) { return (type == WINDOW_TOOLBAR) ? myWindowToolBar : myFullscreenToolBar; }
 
 friend class ZLQtToolBarAction;
-	std::map<const ZLApplication::Toolbar::Item*, QAction*> myActions;
+	std::map<const ZLToolbar::Item*,QAction*> myActions;
+	std::map<const ZLToolbar::MenuButtonItem*,QToolButton*> myMenuButtons;
+	std::map<const ZLToolbar::MenuButtonItem*,size_t> myPopupIdMap;
 
 	bool myFullScreen;
 	bool myWasMaximized;
 
 	bool myCursorIsHyperlink;
 	QCursor myStoredCursor;
+
+private:
+	class LineEditParameter : public VisualParameter {
+
+	public:
+		LineEditParameter(QToolBar *toolbar, ZLQtApplicationWindow &window, const ZLToolbar::TextFieldItem &textFieldItem);
+		QAction *action() const;
+		void restoreOldValue();
+
+	private:
+		std::string internalValue() const;
+		void internalSetValue(const std::string &value);
+		void setValueList(const std::vector<std::string> &values) {}
+
+	private:
+		QLineEdit *myEdit;
+		QAction *myAction;
+	};
+
+friend class ZLQtLineEdit;
 };
 
 class ZLQtToolBarAction : public QAction {
 	Q_OBJECT
 
 public:
-	ZLQtToolBarAction(ZLQtApplicationWindow *parent, ZLApplication::Toolbar::ButtonItem &item);
+	ZLQtToolBarAction(ZLQtApplicationWindow *parent, ZLToolbar::AbstractButtonItem &item);
 
 private Q_SLOTS:
 	void onActivated();
 
 private:
-	ZLApplication::Toolbar::ButtonItem &myItem;
+	ZLToolbar::AbstractButtonItem &myItem;
 };
 
+class ZLQtRunPopupAction : public QAction {
+	Q_OBJECT
+
+public:
+	ZLQtRunPopupAction(QObject *parent, shared_ptr<ZLPopupData> data, size_t index);
+	~ZLQtRunPopupAction();
+
+private Q_SLOTS:
+	void onActivated();
+
+private:
+	shared_ptr<ZLPopupData> myData;
+	const size_t myIndex;
+};
 
 #endif /* __ZLQTAPPLICATIONWINDOW_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,8 @@
 #include "ZLQtWaitMessage.h"
 #include "ZLQtUtil.h"
 
+#include "../image/ZLQtImageManager.h"
+
 shared_ptr<ZLOptionsDialog> ZLQtDialogManager::createOptionsDialog(const ZLResourceKey &key, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const {
 	myStoredWindow = qApp->activeWindow();
 	return new ZLQtOptionsDialog(resource()[key], applyAction, showApplyButton);
@@ -41,12 +43,12 @@
 	return new ZLQtDialog(resource()[key]);
 }
 
-void ZLQtDialogManager::informationBox(const ZLResourceKey &key, const std::string &message) const {
+void ZLQtDialogManager::informationBox(const std::string &title, const std::string &message) const {
 	QWidget *parent = qApp->activeWindow();
 	if (parent == 0) {
 		parent = myStoredWindow;
 	}
-	QMessageBox::information(parent, ::qtString(dialogTitle(key)), ::qtString(message), ::qtButtonName(OK_BUTTON));
+	QMessageBox::information(parent, ::qtString(title), ::qtString(message), ::qtButtonName(OK_BUTTON));
 }
 
 void ZLQtDialogManager::errorBox(const ZLResourceKey &key, const std::string &message) const {
@@ -87,3 +89,10 @@
 		);
 	}
 }
+
+void ZLQtDialogManager::setClipboardImage(const ZLImageData &imageData, ClipboardType type) const {
+	qApp->clipboard()->setImage(
+		*((ZLQtImageData&)imageData).image(),
+		(type == CLIPBOARD_MAIN) ? QClipboard::Clipboard : QClipboard::Selection
+	);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 
 	shared_ptr<ZLDialog> createDialog(const ZLResourceKey &key) const;
 	shared_ptr<ZLOptionsDialog> createOptionsDialog(const ZLResourceKey &key, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const;
-	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	void informationBox(const std::string &title, const std::string &message) const;
 	void errorBox(const ZLResourceKey &key, const std::string &message) const;
 	int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const;
 	bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const;
@@ -45,6 +45,7 @@
 
 	bool isClipboardSupported(ClipboardType type) const;
 	void setClipboardText(const std::string &text, ClipboardType type) const;
+	void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const;
 
 private:
 	mutable QWidget *myStoredWindow;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/dialogs/ZLQtWaitMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/image/ZLQtImageManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/image/ZLQtImageManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/image/ZLQtImageManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/image/ZLQtImageManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/image/ZLQtImageManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/image/ZLQtImageManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/image/ZLQtImageManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/image/ZLQtImageManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include <ZLApplication.h>
 #include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 
 #include "../../../../core/src/unix/library/ZLibraryImplementation.h"
 
@@ -67,6 +68,9 @@
 }
 
 void ZLQtLibraryImplementation::run(ZLApplication *application) {
+	if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+		qApp->setLayoutDirection(Qt::RightToLeft);
+	}
 	ZLDialogManager::instance().createApplicationWindow(application);
 	application->initWindow();
 	qApp->exec();
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/time/ZLQtTime.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/time/ZLQtTime.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/time/ZLQtTime.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/time/ZLQtTime.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/time/ZLQtTime.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/time/ZLQtTime.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/time/ZLQtTime.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/time/ZLQtTime.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/util/ZLQtKeyUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/view/moc.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/moc.mk
--- fbreader-0.8.17/zlibrary/ui/src/qt4/view/moc.mk	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/moc.mk	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+SRCMOC = ZLQtViewWidget.moc.cpp
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -143,7 +143,7 @@
 	));
 }
 
-int ZLQtPaintContext::stringWidth(const char *str, int len) const {
+int ZLQtPaintContext::stringWidth(const char *str, int len, bool) const {
 	return myPainter->fontMetrics().width(QString::fromUtf8(str, len));
 }
 
@@ -162,8 +162,9 @@
 	return myPainter->font().pointSize() + 2;
 }
 
-void ZLQtPaintContext::drawString(int x, int y, const char *str, int len) {
+void ZLQtPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
 	QString qStr = QString::fromUtf8(str, len);
+	myPainter->setLayoutDirection(rtl ? Qt::RightToLeft : Qt::LeftToRight);
 	myPainter->drawText(x, y, qStr);
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,11 +47,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,33 +17,91 @@
  * 02110-1301, USA.
  */
 
-#include "ZLQtViewWidget.h"
-#include "ZLQtPaintContext.h"
+#include <algorithm>
 
+#include <QtGui/QLayout>
+#include <QtGui/QScrollBar>
 #include <QtGui/QPainter>
 #include <QtGui/QPixmap>
 #include <QtGui/QMouseEvent>
 
-ZLQtViewWidget::ZLQtViewWidgetInternal::ZLQtViewWidgetInternal(QWidget *parent, ZLQtViewWidget &holder) : QWidget(parent), myHolder(holder) {
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
+
+#include "ZLQtViewWidget.h"
+#include "ZLQtPaintContext.h"
+
+class MyQScrollBar : public QScrollBar {
+
+public:
+	MyQScrollBar(Qt::Orientation orientation, QWidget *parent) : QScrollBar(orientation, parent) {
+	}
+
+private:
+	void mouseMoveEvent(QMouseEvent *event) {
+		if (orientation() == Qt::Vertical) {
+			const int y = event->y();
+			if ((y <= 0) || (y >= height())) {
+				return;
+			}
+		} else {
+			const int x = event->x();
+			if ((x <= 0) || (x >= width())) {
+				return;
+			}
+		}
+		QScrollBar::mouseMoveEvent(event);
+	}
+};
+
+ZLQtViewWidget::Widget::Widget(QWidget *parent, ZLQtViewWidget &holder) : QWidget(parent), myHolder(holder) {
 	//setBackgroundMode(NoBackground);
 }
 
-ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLApplication *application) : ZLViewWidget((ZLViewWidget::Angle)application->AngleStateOption.value()), myApplication(application) {
-	myQWidget = new ZLQtViewWidgetInternal(parent, *this);
+QScrollBar *ZLQtViewWidget::addScrollBar(QGridLayout *layout, Qt::Orientation orientation, int x, int y) {
+	QScrollBar *scrollBar = new MyQScrollBar(orientation, myFrame);
+	layout->addWidget(scrollBar, x, y);
+	scrollBar->hide();
+	if (orientation == Qt::Vertical) {
+		connect(scrollBar, SIGNAL(sliderMoved(int)), this, SLOT(onVerticalSliderMoved(int)));
+		connect(scrollBar, SIGNAL(actionTriggered(int)), this, SLOT(onVerticalSliderClicked(int)));
+	} else {
+		connect(scrollBar, SIGNAL(sliderMoved(int)), this, SLOT(onHorizontalSliderMoved(int)));
+		connect(scrollBar, SIGNAL(actionTriggered(int)), this, SLOT(onHorizontalSliderClicked(int)));
+	}
+	return scrollBar;
+}
+
+ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLApplication *application) : ZLViewWidget((ZLView::Angle)application->AngleStateOption.value()), myApplication(application) {
+	myFrame = new QWidget(parent);
+	QGridLayout *layout = new QGridLayout();
+	layout->setMargin(0);
+	layout->setSpacing(0);
+	myFrame->setLayout(layout);
+	myQWidget = new Widget(myFrame, *this);
+	layout->addWidget(myQWidget, 1, 1);
+
+	myRightScrollBar = addScrollBar(layout, Qt::Vertical, 1, 2);
+	myLeftScrollBar = addScrollBar(layout, Qt::Vertical, 1, 0);
+	myShowScrollBarAtRight = true;
+
+	myBottomScrollBar = addScrollBar(layout, Qt::Horizontal, 2, 1);
+	myTopScrollBar = addScrollBar(layout, Qt::Horizontal, 0, 1);
+	myShowScrollBarAtBottom = true;
 }
 
 void ZLQtViewWidget::trackStylus(bool track) {
 	myQWidget->setMouseTracking(track);
 }
 
-void ZLQtViewWidget::ZLQtViewWidgetInternal::paintEvent(QPaintEvent*) {
+void ZLQtViewWidget::Widget::paintEvent(QPaintEvent*) {
 	ZLQtPaintContext &context = (ZLQtPaintContext&)myHolder.view()->context();
 	switch (myHolder.rotation()) {
 		default:
 			context.setSize(width(), height());
 			break;
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			context.setSize(height(), width());
 			break;
 	}
@@ -53,31 +111,31 @@
 		default:
 			realPainter.drawPixmap(0, 0, context.pixmap());
 			break;
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			realPainter.rotate(270);
 			realPainter.drawPixmap(1 - height(), -1, context.pixmap());
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			realPainter.rotate(180);
 			realPainter.drawPixmap(1 - width(), 1 - height(), context.pixmap());
 			break;
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			realPainter.rotate(90);
 			realPainter.drawPixmap(-1, 1 - width(), context.pixmap());
 			break;
 	}
 }
 
-void ZLQtViewWidget::ZLQtViewWidgetInternal::mousePressEvent(QMouseEvent *event) {
+void ZLQtViewWidget::Widget::mousePressEvent(QMouseEvent *event) {
 	myHolder.view()->onStylusMove(x(event), y(event));
 	myHolder.view()->onStylusPress(x(event), y(event));
 }
 
-void ZLQtViewWidget::ZLQtViewWidgetInternal::mouseReleaseEvent(QMouseEvent *event) {
+void ZLQtViewWidget::Widget::mouseReleaseEvent(QMouseEvent *event) {
 	myHolder.view()->onStylusRelease(x(event), y(event));
 }
 
-void ZLQtViewWidget::ZLQtViewWidgetInternal::mouseMoveEvent(QMouseEvent *event) {
+void ZLQtViewWidget::Widget::mouseMoveEvent(QMouseEvent *event) {
 	switch (event->buttons()) {
 		case Qt::LeftButton:
 			myHolder.view()->onStylusMovePressed(x(event), y(event));
@@ -90,32 +148,32 @@
 	}
 }
 
-int ZLQtViewWidget::ZLQtViewWidgetInternal::x(const QMouseEvent *event) const {
+int ZLQtViewWidget::Widget::x(const QMouseEvent *event) const {
 	const int maxX = width() - 1;
 	const int maxY = height() - 1;
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return std::min(std::max(event->y(), 0), maxY);
 	}
 }
 
-int ZLQtViewWidget::ZLQtViewWidgetInternal::y(const QMouseEvent *event) const {
+int ZLQtViewWidget::Widget::y(const QMouseEvent *event) const {
 	const int maxX = width() - 1;
 	const int maxY = height() - 1;
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->y(), 0), maxY);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
 	}
 }
@@ -123,3 +181,119 @@
 void ZLQtViewWidget::repaint()	{
 	myQWidget->repaint();
 }
+
+void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+	if (direction == ZLView::VERTICAL) {
+		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
+	} else {
+		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
+	}
+}
+
+void ZLQtViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+	if ((rotation() == ZLView::DEGREES90) || (rotation() == ZLView::DEGREES270)) {
+		if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+			standard = !standard;
+		}
+	}
+	if (direction == ZLView::VERTICAL) {
+		if (standard != myShowScrollBarAtRight) {
+			myShowScrollBarAtRight = standard;
+			QScrollBar *old = standard ? myLeftScrollBar : myRightScrollBar;
+			QScrollBar *current = standard ? myRightScrollBar : myLeftScrollBar;
+			if (old->isVisible()) {
+				old->hide();
+				current->show();
+			}
+		}
+	} else {
+		if (standard != myShowScrollBarAtBottom) {
+			myShowScrollBarAtBottom = standard;
+			QScrollBar *old = standard ? myTopScrollBar : myBottomScrollBar;
+			QScrollBar *current = standard ? myBottomScrollBar : myTopScrollBar;
+			if (old->isVisible()) {
+				old->hide();
+				current->show();
+			}
+		}
+	}
+}
+
+void ZLQtViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	QScrollBar *bar =
+		(direction == ZLView::VERTICAL) ?
+			(myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar) :
+			(myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar);
+	bar->setMinimum(0);
+	bar->setMaximum(full + from - to);
+	bar->setValue(from);
+	bar->setPageStep(to - from);
+}
+
+void ZLQtViewWidget::onVerticalSliderMoved(int value) {
+	QScrollBar *bar =
+		myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar;
+	int maxValue = bar->maximum();
+	int pageStep = bar->pageStep();
+	value = std::max(std::min(value, maxValue), 0);
+	onScrollbarMoved(
+		ZLView::VERTICAL,
+		maxValue + pageStep,
+		value,
+		value + pageStep
+	);
+}
+
+void ZLQtViewWidget::onHorizontalSliderMoved(int value) {
+	QScrollBar *bar =
+		myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar;
+	int maxValue = bar->maximum();
+	int pageStep = bar->pageStep();
+	value = std::max(std::min(value, maxValue), 0);
+	onScrollbarMoved(
+		ZLView::HORIZONTAL,
+		maxValue + pageStep,
+		value,
+		value + pageStep
+	);
+}
+
+void ZLQtViewWidget::onVerticalSliderClicked(int value) {
+	switch (value) {
+		case QScrollBar::SliderSingleStepAdd:
+			onScrollbarStep(ZLView::VERTICAL, 1);
+			break;
+		case QScrollBar::SliderSingleStepSub:
+			onScrollbarStep(ZLView::VERTICAL, -1);
+			break;
+		case QScrollBar::SliderPageStepAdd:
+			onScrollbarPageStep(ZLView::VERTICAL, 1);
+			break;
+		case QScrollBar::SliderPageStepSub:
+			onScrollbarPageStep(ZLView::VERTICAL, -1);
+			break;
+	}
+}
+
+void ZLQtViewWidget::onHorizontalSliderClicked(int value) {
+	switch (value) {
+		case QScrollBar::SliderSingleStepAdd:
+			onScrollbarStep(ZLView::HORIZONTAL, 1);
+			break;
+		case QScrollBar::SliderSingleStepSub:
+			onScrollbarStep(ZLView::HORIZONTAL, -1);
+			break;
+		case QScrollBar::SliderPageStepAdd:
+			onScrollbarPageStep(ZLView::HORIZONTAL, 1);
+			break;
+		case QScrollBar::SliderPageStepSub:
+			onScrollbarPageStep(ZLView::HORIZONTAL, -1);
+			break;
+	}
+}
+
+QWidget *ZLQtViewWidget::widget() {
+	return myFrame;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,16 +22,20 @@
 
 #include <QtGui/QWidget>
 
-#include <ZLView.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
 #include <ZLApplication.h>
 
-class ZLQtViewWidget : public ZLViewWidget {
+class QGridLayout;
+class QScrollBar;
+
+class ZLQtViewWidget : public QObject, public ZLViewWidget {
+	Q_OBJECT
 
 private:
-	class ZLQtViewWidgetInternal : public QWidget {
+	class Widget : public QWidget {
 
 	public:
-		ZLQtViewWidgetInternal(QWidget *parent, ZLQtViewWidget &holder);
+		Widget(QWidget *parent, ZLQtViewWidget &holder);
 
 	private:
 		void paintEvent(QPaintEvent *event);
@@ -50,15 +54,35 @@
 	ZLQtViewWidget(QWidget *parent, ZLApplication *application);
 	QWidget *widget();
 
+private Q_SLOTS:
+	void onVerticalSliderMoved(int value);
+	void onHorizontalSliderMoved(int value);
+	void onVerticalSliderClicked(int value);
+	void onHorizontalSliderClicked(int value);
+
 private:
 	void repaint();
 	void trackStylus(bool track);
 
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to);
+
+	QScrollBar *addScrollBar(QGridLayout *layout, Qt::Orientation orientation, int x, int y);
+
 private:
-	ZLQtViewWidgetInternal *myQWidget;
+	QWidget *myFrame;
+	Widget *myQWidget;
+
+	QScrollBar *myRightScrollBar;
+	QScrollBar *myLeftScrollBar;
+	bool myShowScrollBarAtRight;
+
+	QScrollBar *myBottomScrollBar;
+	QScrollBar *myTopScrollBar;
+	bool myShowScrollBarAtBottom;
+
 	ZLApplication *myApplication;
 };
 
-inline QWidget *ZLQtViewWidget::widget() { return myQWidget; }
-
 #endif /* __ZLQTVIEWWIDGET_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,8 +38,8 @@
 public:
 	MyMenuBar(QWidget *parent, ZLQtApplicationWindow &window) : QPEMenuBar(parent), myWindow(window), myIndex(-1) {}
 	~MyMenuBar();
-	void setItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
+	void setItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
 
 private:
 	void attachWidget(ZLOptionView &view, QWidget *widget);
@@ -61,7 +61,10 @@
 	int myIndex;
 };
 
-ToolBarButton::ToolBarButton(ZLQtApplicationWindow &window, ZLApplication::Toolbar::ButtonItem &button) : myWindow(window), myButton(button), myReleasedPixmap(0), myPressedPixmap(0), myIsPressed(button.isPressed()) {
+ToolBarButton::ToolBarButton(ZLQtApplicationWindow &window, const ZLToolbar::AbstractButtonItem &button) : myWindow(window), myButton(button), myReleasedPixmap(0), myPressedPixmap(0), myIsPressed(false) {
+	if (button.type() == ZLToolbar::Item::TOGGLE_BUTTON) {
+		myIsPressed = ((const ZLToolbar::ToggleButtonItem&)button).isPressed();
+	}
 }
 
 ToolBarButton::~ToolBarButton() {
@@ -77,7 +80,8 @@
 	if (myReleasedPixmap == 0) {
 		myReleasedPixmap = new QPixmap(Resource::loadPixmap((ZLibrary::ApplicationName() + ZLibrary::FileNameDelimiter + myButton.iconName()).c_str()));
 	}
-	if (myButton.isPressed()) {
+	if ((myButton.type() == ZLToolbar::Item::TOGGLE_BUTTON) &&
+			((const ZLToolbar::ToggleButtonItem&)myButton).isPressed()) {
 		if (myPressedPixmap == 0) {
 			const int w = myReleasedPixmap->width();
 			const int h = myReleasedPixmap->height();
@@ -95,7 +99,8 @@
 }
 
 bool ToolBarButton::toggle() {
-	if (myIsPressed != myButton.isPressed()) {
+	if ((myButton.type() == ZLToolbar::Item::TOGGLE_BUTTON) &&
+			((const ZLToolbar::ToggleButtonItem&)myButton).isPressed() != myIsPressed) {
 		myIsPressed = !myIsPressed;
 		return true;
 	}
@@ -157,7 +162,7 @@
 	}
 }
 
-void ZLQtApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr) {
+void ZLQtApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr) {
 }
 
 void ZLQtApplicationWindow::initMenu() {
@@ -166,16 +171,16 @@
 ZLQtApplicationWindow::MenuMaskCalculator::MenuMaskCalculator(ZLQtApplicationWindow &window) : myWindow(window), myFirstTime(myWindow.myMenuMask.empty()), myShouldBeUpdated(myFirstTime), myCounter(0) {
 }
 
-void ZLQtApplicationWindow::MenuMaskCalculator::processSubmenuBeforeItems(ZLApplication::Menubar::Submenu&) {
+void ZLQtApplicationWindow::MenuMaskCalculator::processSubmenuBeforeItems(ZLMenubar::Submenu&) {
 }
 
-void ZLQtApplicationWindow::MenuMaskCalculator::processSubmenuAfterItems(ZLApplication::Menubar::Submenu&) {
+void ZLQtApplicationWindow::MenuMaskCalculator::processSubmenuAfterItems(ZLMenubar::Submenu&) {
 }
 
-void ZLQtApplicationWindow::MenuMaskCalculator::processSepartor(ZLApplication::Menubar::Separator&) {
+void ZLQtApplicationWindow::MenuMaskCalculator::processSepartor(ZLMenubar::Separator&) {
 }
 
-void ZLQtApplicationWindow::MenuMaskCalculator::processItem(ZLApplication::Menubar::PlainItem &item) {
+void ZLQtApplicationWindow::MenuMaskCalculator::processItem(ZLMenubar::PlainItem &item) {
 	bool visible = myWindow.application().isActionVisible(item.actionId());
 	if (myFirstTime) {
 		myWindow.myMenuMask.push_back(visible);
@@ -192,17 +197,17 @@
 	myMenuStack.push(myWindow.myMenu);
 }
 
-void ZLQtApplicationWindow::MenuUpdater::processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu) {
+void ZLQtApplicationWindow::MenuUpdater::processSubmenuBeforeItems(ZLMenubar::Submenu &submenu) {
 	QPopupMenu *qmenu = new QPopupMenu(myMenuStack.top());
 	myMenuStack.top()->insertItem(::qtString(submenu.menuName()), qmenu);
 	myMenuStack.push(qmenu);
 }
 
-void ZLQtApplicationWindow::MenuUpdater::processSubmenuAfterItems(ZLApplication::Menubar::Submenu&) {
+void ZLQtApplicationWindow::MenuUpdater::processSubmenuAfterItems(ZLMenubar::Submenu&) {
 	myMenuStack.pop();
 }
 
-void ZLQtApplicationWindow::MenuUpdater::processItem(ZLApplication::Menubar::PlainItem &item) {
+void ZLQtApplicationWindow::MenuUpdater::processItem(ZLMenubar::PlainItem &item) {
 	if (myWindow.myMenuMask[myCounter++]) {
 		const std::string &id = item.actionId();
 		ZLQtMenuAction *action = myWindow.myMenuMap[id];
@@ -215,41 +220,45 @@
 	}
 }
 
-void ZLQtApplicationWindow::MenuUpdater::processSepartor(ZLApplication::Menubar::Separator&) {
+void ZLQtApplicationWindow::MenuUpdater::processSepartor(ZLMenubar::Separator&) {
 	myMenuStack.top()->insertSeparator();
 }
 
-void MyMenuBar::setItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
+void MyMenuBar::setItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
 	switch (item->type()) {
-		case ZLApplication::Toolbar::Item::BUTTON:
-			{
-				ZLApplication::Toolbar::ButtonItem &button = (ZLApplication::Toolbar::ButtonItem&)*item;
-				const std::string &id = button.actionId();
-				std::map<std::string,int> ::const_iterator iter = myActionIndices.find(id);
-				int actionIndex = (iter != myActionIndices.end()) ? iter->second : 0;
-				if (visible) {
-					if ((actionIndex == 0) || (idAt(myIndex) != actionIndex)) {
-						ToolBarButton *tbButton = myButtons[id];
-						if (actionIndex == 0) {
-							tbButton = new ToolBarButton(myWindow, button);
-							myButtons[id] = tbButton;
-							actionIndex = myActionIndices.size() + 1;
-							myActionIndices[id] = actionIndex;
-						}
-						insertItem(tbButton->pixmap(), tbButton, SLOT(doActionSlot()), 0, actionIndex, myIndex);
-					}
-					setItemEnabled(actionIndex, enabled);
-					++myIndex;
-				} else {
-					if ((actionIndex != 0) && (idAt(myIndex) == actionIndex)) {
-						removeItem(actionIndex);
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+		{
+			ZLToolbar::AbstractButtonItem &button =
+				(ZLToolbar::AbstractButtonItem&)*item;
+			const std::string &id = button.actionId();
+			std::map<std::string,int> ::const_iterator iter = myActionIndices.find(id);
+			int actionIndex = (iter != myActionIndices.end()) ? iter->second : 0;
+			if (visible) {
+				if ((actionIndex == 0) || (idAt(myIndex) != actionIndex)) {
+					ToolBarButton *tbButton = myButtons[id];
+					if (actionIndex == 0) {
+						tbButton = new ToolBarButton(myWindow, button);
+						myButtons[id] = tbButton;
+						actionIndex = myActionIndices.size() + 1;
+						myActionIndices[id] = actionIndex;
 					}
+					insertItem(tbButton->pixmap(), tbButton, SLOT(doActionSlot()), 0, actionIndex, myIndex);
+				}
+				setItemEnabled(actionIndex, enabled);
+				++myIndex;
+			} else {
+				if ((actionIndex != 0) && (idAt(myIndex) == actionIndex)) {
+					removeItem(actionIndex);
 				}
 			}
 			break;
-		case ZLApplication::Toolbar::Item::OPTION_ENTRY:
+		}
+		/*
+		case ZLToolbar::Item::OPTION_ENTRY:
 			if (idAt(myIndex) < 10001) {
-				shared_ptr<ZLOptionEntry> entry = ((ZLApplication::Toolbar::OptionEntryItem&)*item).entry();
+				shared_ptr<ZLOptionEntry> entry = ((ZLToolbar::OptionEntryItem&)*item).entry();
 				if (entry->isVisible()) {
 					ZLOptionView *view = createViewByEntry("", "", entry);
 					view->setVisible(true);
@@ -258,12 +267,13 @@
 				++myIndex;
 			}
 			break;
-		case ZLApplication::Toolbar::Item::SEPARATOR:
+		*/
+		case ZLToolbar::Item::SEPARATOR:
 			break;
 	}
 }
 
-void ZLQtApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
+void ZLQtApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
 	((MyMenuBar*)myToolBar)->setItemState(item, visible, enabled);
 }
 
@@ -394,7 +404,7 @@
 	return viewWidget;
 }
 
-ZLQtMenuAction::ZLQtMenuAction(ZLQtApplicationWindow &window, const ZLApplication::Menubar::PlainItem &item) : QAction(::qtString(item.name()), 0, 0, 0), myWindow(window), myActionId(item.actionId()) {
+ZLQtMenuAction::ZLQtMenuAction(ZLQtApplicationWindow &window, const ZLMenubar::PlainItem &item) : QAction(::qtString(item.name()), 0, 0, 0), myWindow(window), myActionId(item.actionId()) {
 	connect(this, SIGNAL(activated()), this, SLOT(doSlot()));
 }
 
@@ -403,7 +413,7 @@
 	myWindow.myMainWindow->setFocus();
 }
 
-void MyMenuBar::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
+void MyMenuBar::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
 	const std::string &actionId = button.actionId();
 	ToolBarButton *tbButton = myButtons[actionId];
 	if ((tbButton != 0) && (tbButton->toggle())) {
@@ -411,7 +421,7 @@
 	}
 }
 
-void ZLQtApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
+void ZLQtApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
 	((MyMenuBar*)myToolBar)->setToggleButtonState(button);
 }
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/application/ZLQtApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,7 @@
 #include <qmainwindow.h>
 
 #include "../../../../core/src/application/ZLApplicationWindow.h"
+#include "../../../../core/src/application/ZLMenu.h"
 
 class QMenuBar;
 class QPopupMenu;
@@ -69,19 +70,19 @@
 private:
 	ZLViewWidget *createViewWidget();
 
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
+	void addToolbarItem(ZLToolbar::ItemPtr item);
 	void initMenu();
-	class MenuMaskCalculator : public ZLApplication::MenuVisitor {
+	class MenuMaskCalculator : public ZLMenuVisitor {
 
 	public:
 		MenuMaskCalculator(ZLQtApplicationWindow &window);
 		bool shouldBeUpdated();
 
 	private:
-		void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu);
-		void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu);
-		void processItem(ZLApplication::Menubar::PlainItem &item);
-		void processSepartor(ZLApplication::Menubar::Separator &separator);
+		void processSubmenuBeforeItems(ZLMenubar::Submenu &submenu);
+		void processSubmenuAfterItems(ZLMenubar::Submenu &submenu);
+		void processItem(ZLMenubar::PlainItem &item);
+		void processSepartor(ZLMenubar::Separator &separator);
 
 	private:
 		ZLQtApplicationWindow &myWindow;
@@ -89,16 +90,16 @@
 		bool myShouldBeUpdated;
 		int myCounter;
 	};
-	class MenuUpdater : public ZLApplication::MenuVisitor {
+	class MenuUpdater : public ZLMenuVisitor {
 
 	public:
 		MenuUpdater(ZLQtApplicationWindow &window);
 
 	private:
-		void processSubmenuBeforeItems(ZLApplication::Menubar::Submenu &submenu);
-		void processSubmenuAfterItems(ZLApplication::Menubar::Submenu &submenu);
-		void processItem(ZLApplication::Menubar::PlainItem &item);
-		void processSepartor(ZLApplication::Menubar::Separator &separator);
+		void processSubmenuBeforeItems(ZLMenubar::Submenu &submenu);
+		void processSubmenuAfterItems(ZLMenubar::Submenu &submenu);
+		void processItem(ZLMenubar::PlainItem &item);
+		void processSepartor(ZLMenubar::Separator &separator);
 
 	private:
 		ZLQtApplicationWindow &myWindow;
@@ -117,8 +118,8 @@
 	bool isFullscreen() const;
 	void setFullscreen(bool fullscreen);
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
 
 private:
 	std::vector<bool> myToolbarMask;
@@ -145,7 +146,7 @@
 	Q_OBJECT
 
 public:	
-	ToolBarButton(ZLQtApplicationWindow &window, ZLApplication::Toolbar::ButtonItem &button);
+	ToolBarButton(ZLQtApplicationWindow &window, const ZLToolbar::AbstractButtonItem &button);
 	~ToolBarButton();
 
 	QPixmap &pixmap();
@@ -157,7 +158,7 @@
 
 private:
 	ZLQtApplicationWindow &myWindow;
-	ZLApplication::Toolbar::ButtonItem &myButton;
+	const ZLToolbar::AbstractButtonItem &myButton;
 	QPixmap *myReleasedPixmap;
 	QPixmap *myPressedPixmap;
 	bool myIsPressed;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/application/ZLQtMenuAction.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/application/ZLQtMenuAction.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/application/ZLQtMenuAction.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/application/ZLQtMenuAction.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,13 +24,15 @@
 
 #include <ZLApplication.h>
 
+#include "../../../../core/src/application/ZLMenu.h"
+
 class ZLQtApplicationWindow;
 
 class ZLQtMenuAction : public QAction {
 	Q_OBJECT
 
 public:
-	ZLQtMenuAction(ZLQtApplicationWindow &window, const ZLApplication::Menubar::PlainItem &item);
+	ZLQtMenuAction(ZLQtApplicationWindow &window, const ZLMenubar::PlainItem &item);
 
 private slots:
 	void doSlot();
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLFullScreenDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #include "ZLQtUtil.h"
 
 #include "../application/ZLQtApplicationWindow.h"
+#include "../../qt/image/ZLQtImageManager.h"
 
 void ZLQtDialogManager::createApplicationWindow(ZLApplication *application) const {
 	myApplicationWindow = new ZLQtApplicationWindow(application);
@@ -85,3 +86,11 @@
 		qApp->clipboard()->setText(::qtString(text));
 	}
 }
+
+void ZLQtDialogManager::setClipboardImage(const ZLImageData &imageData, ClipboardType type) const {
+#ifndef QT_NO_MIMECLIPBOARD
+	if (type == CLIPBOARD_MAIN) {
+		qApp->clipboard()->setImage((ZLQtImageData&)imageData);
+	}
+#endif // QT_NO_MIMECLIPBOARD
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtDialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -46,6 +46,7 @@
 
 	bool isClipboardSupported(ClipboardType type) const;
 	void setClipboardText(const std::string &text, ClipboardType type) const;
+	void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const;
 
 	void fullScreenWorkaround() const;
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtOptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtSelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtUtil.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/dialogs/ZLQtWaitMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/message/ZLQtopiaMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/optionView/ZLQtOptionViewHolder.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/moc.mk /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/moc.mk
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/moc.mk	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/moc.mk	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1 @@
+SRCMOC = ZLQtViewWidget.moc.cpp
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <fribidi/fribidi.h>
+
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qfontmetrics.h>
@@ -170,7 +172,7 @@
 	));
 }
 
-int ZLQtPaintContext::stringWidth(const char *str, int len) const {
+int ZLQtPaintContext::stringWidth(const char *str, int len, bool rtl) const {
 	return myPainter->fontMetrics().width(QString::fromUtf8(str, len));
 }
 
@@ -189,9 +191,22 @@
 	return myPainter->font().pointSize() + 2;
 }
 
-void ZLQtPaintContext::drawString(int x, int y, const char *str, int len) {
-	QString qStr = QString::fromUtf8(str, len);
-	myPainter->drawText(x, y, qStr);
+void ZLQtPaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
+	if (rtl) {
+		static ZLUnicodeUtil::Ucs2String ucs2Str;
+		ucs2Str.clear();
+		ZLUnicodeUtil::utf8ToUcs2(ucs2Str, str, len);
+		QString qStr;
+		FriBidiChar ch;
+		for (int i = ucs2Str.size() - 1; i >= 0; --i) {
+			fribidi_get_mirror_char(ucs2Str[i], &ch);
+			qStr.append(QChar(ch));
+		}
+		myPainter->drawText(x, y, qStr);
+	} else {
+		QString qStr = QString::fromUtf8(str, len);
+		myPainter->drawText(x, y, qStr);
+	}
 }
 
 void ZLQtPaintContext::drawImage(int x, int y, const ZLImageData &image) {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtPaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -48,11 +48,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +23,11 @@
 #include <qpixmap.h>
 #include <qframe.h>
 #include <qimage.h>
+#include <qlayout.h>
+#include <qscrollbar.h>
+
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 
 #include "ZLQtViewWidget.h"
 #include "ZLQtPaintContext.h"
@@ -32,8 +37,47 @@
 	setBackgroundMode(NoBackground);
 }
 
-ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLQtApplicationWindow &applicationWindow) : ZLViewWidget((ZLViewWidget::Angle)applicationWindow.application().AngleStateOption.value()), myApplicationWindow(applicationWindow) {
-	myQWidget = new ZLQtViewWidgetInternal(parent, *this);
+QScrollBar *ZLQtViewWidget::addScrollBar(QGridLayout *layout, Qt::Orientation orientation, int x, int y) {
+	QScrollBar *scrollBar = new QScrollBar(orientation, myFrame);
+	layout->addWidget(scrollBar, x, y);
+	//scrollBar->hide();
+	if (orientation == Qt::Vertical) {
+		connect(scrollBar, SIGNAL(sliderMoved(int)), this, SLOT(onVerticalSliderMoved(int)));
+		connect(scrollBar, SIGNAL(nextLine()), this, SLOT(onVerticalSliderStepNext()));
+		connect(scrollBar, SIGNAL(nextPage()), this, SLOT(onVerticalSliderPageNext()));
+		connect(scrollBar, SIGNAL(prevLine()), this, SLOT(onVerticalSliderStepPrevious()));
+		connect(scrollBar, SIGNAL(prevPage()), this, SLOT(onVerticalSliderPagePrevious()));
+	} else {
+		connect(scrollBar, SIGNAL(sliderMoved(int)), this, SLOT(onHorizontalSliderMoved(int)));
+		connect(scrollBar, SIGNAL(nextLine()), this, SLOT(onHorizontalSliderStepNext()));
+		connect(scrollBar, SIGNAL(nextPage()), this, SLOT(onHorizontalSliderPageNext()));
+		connect(scrollBar, SIGNAL(prevLine()), this, SLOT(onHorizontalSliderStepPrevious()));
+		connect(scrollBar, SIGNAL(prevPage()), this, SLOT(onHorizontalSliderPagePrevious()));
+	}
+	return scrollBar;
+}
+
+ZLQtViewWidget::ZLQtViewWidget(QWidget *parent, ZLQtApplicationWindow &applicationWindow) : ZLViewWidget((ZLView::Angle)applicationWindow.application().AngleStateOption.value()), myApplicationWindow(applicationWindow) {
+	myFrame = new QFrame(parent);
+	QGridLayout *layout = new QGridLayout(myFrame, 3, 3);
+	layout->setRowStretch(0, 0);
+	layout->setRowStretch(1, 1);
+	layout->setRowStretch(2, 0);
+	layout->setColStretch(0, 0);
+	layout->setColStretch(1, 1);
+	layout->setColStretch(2, 0);
+	myQWidget = new ZLQtViewWidgetInternal(myFrame, *this);
+  layout->addWidget(myQWidget, 1, 1);
+
+	/*
+	myRightScrollBar = addScrollBar(layout, Qt::Vertical, 1, 2);
+	myLeftScrollBar = addScrollBar(layout, Qt::Vertical, 1, 0);
+	myShowScrollBarAtRight = true;
+
+	myBottomScrollBar = addScrollBar(layout, Qt::Horizontal, 2, 1);
+	myTopScrollBar = addScrollBar(layout, Qt::Horizontal, 0, 1);
+	myShowScrollBarAtBottom = true;
+	*/
 }
 
 void ZLQtViewWidget::trackStylus(bool track) {
@@ -47,8 +91,8 @@
 		default:
 			((ZLQtPaintContext&)myHolder.view()->context()).setSize(w, h);
 			break;
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			((ZLQtPaintContext&)myHolder.view()->context()).setSize(h, w);
 			break;
 	}
@@ -58,13 +102,13 @@
 	switch (myHolder.rotation()) {
 		default:
 			break;
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			angle = 270;
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			angle = 180;
 			break;
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			angle = 90;
 			break;
 	}
@@ -107,11 +151,11 @@
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return std::min(std::max(event->y(), 0), maxY);
 	}
 }
@@ -122,11 +166,11 @@
 	switch (myHolder.rotation()) {
 		default:
 			return std::min(std::max(event->y(), 0), maxY);
-		case DEGREES90:
+		case ZLView::DEGREES90:
 			return std::min(std::max(event->x(), 0), maxX);
-		case DEGREES180:
+		case ZLView::DEGREES180:
 			return maxY - std::min(std::max(event->y(), 0), maxY);
-		case DEGREES270:
+		case ZLView::DEGREES270:
 			return maxX - std::min(std::max(event->x(), 0), maxX);
 	}
 }
@@ -134,3 +178,130 @@
 void ZLQtViewWidget::repaint()	{
 	myQWidget->repaint(false);
 }
+
+static void setShown(QWidget *widget, bool shown) {
+	if (shown) {
+		widget->show();
+	} else {
+		widget->hide();
+	}
+}
+
+void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+	return;
+	if (direction == ZLView::VERTICAL) {
+		setShown(myRightScrollBar, enabled && myShowScrollBarAtRight);
+		setShown(myLeftScrollBar, enabled && !myShowScrollBarAtRight);
+	} else {
+		setShown(myBottomScrollBar, enabled && myShowScrollBarAtBottom);
+		setShown(myTopScrollBar, enabled && !myShowScrollBarAtBottom);
+	}
+}
+
+void ZLQtViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+	return;
+	if ((rotation() == ZLView::DEGREES90) || (rotation() == ZLView::DEGREES270)) {
+		if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+			standard = !standard;
+		}
+	}
+	if (direction == ZLView::VERTICAL) {
+		if (standard != myShowScrollBarAtRight) {
+			myShowScrollBarAtRight = standard;
+			QScrollBar *old = standard ? myLeftScrollBar : myRightScrollBar;
+			QScrollBar *current = standard ? myRightScrollBar : myLeftScrollBar;
+			if (old->isVisible()) {
+				old->hide();
+				current->show();
+			}
+		}
+	} else {
+		if (standard != myShowScrollBarAtBottom) {
+			myShowScrollBarAtBottom = standard;
+			QScrollBar *old = standard ? myTopScrollBar : myBottomScrollBar;
+			QScrollBar *current = standard ? myBottomScrollBar : myTopScrollBar;
+			if (old->isVisible()) {
+				old->hide();
+				current->show();
+			}
+		}
+	}
+}
+
+void ZLQtViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	return;
+	QScrollBar *bar =
+		(direction == ZLView::VERTICAL) ?  verticalScrollBar() : horizontalScrollBar();
+	bar->setMinValue(0);
+	bar->setMaxValue(full + from - to);
+	bar->setValue(from);
+	bar->setPageStep(to - from);
+}
+
+QWidget *ZLQtViewWidget::widget() const {
+	return myFrame;
+}
+
+void ZLQtViewWidget::onVerticalSliderMoved(int value) {
+	QScrollBar *bar = verticalScrollBar();
+	size_t maxValue = bar->maxValue();
+	size_t pageStep = bar->pageStep();
+	onScrollbarMoved(
+		ZLView::VERTICAL,
+		maxValue + pageStep,
+		(size_t)value,
+		(size_t)value + pageStep
+	);
+}
+
+void ZLQtViewWidget::onVerticalSliderStepNext() {
+	onScrollbarStep(ZLView::VERTICAL, 1);
+}
+
+void ZLQtViewWidget::onVerticalSliderStepPrevious() {
+	onScrollbarStep(ZLView::VERTICAL, -1);
+}
+
+void ZLQtViewWidget::onVerticalSliderPageNext() {
+	onScrollbarPageStep(ZLView::VERTICAL, 1);
+}
+
+void ZLQtViewWidget::onVerticalSliderPagePrevious() {
+	onScrollbarPageStep(ZLView::VERTICAL, -1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderMoved(int value) {
+	QScrollBar *bar = horizontalScrollBar();
+	size_t maxValue = bar->maxValue();
+	size_t pageStep = bar->pageStep();
+	onScrollbarMoved(
+		ZLView::HORIZONTAL,
+		maxValue + pageStep,
+		(size_t)value,
+		(size_t)value + pageStep
+	);
+}
+
+void ZLQtViewWidget::onHorizontalSliderStepNext() {
+	onScrollbarStep(ZLView::HORIZONTAL, 1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderStepPrevious() {
+	onScrollbarStep(ZLView::HORIZONTAL, -1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderPageNext() {
+	onScrollbarPageStep(ZLView::HORIZONTAL, 1);
+}
+
+void ZLQtViewWidget::onHorizontalSliderPagePrevious() {
+	onScrollbarPageStep(ZLView::HORIZONTAL, -1);
+}
+
+QScrollBar *ZLQtViewWidget::verticalScrollBar() {
+	return myShowScrollBarAtRight ? myRightScrollBar : myLeftScrollBar;
+}
+
+QScrollBar *ZLQtViewWidget::horizontalScrollBar() {
+	return myShowScrollBarAtBottom ? myBottomScrollBar : myTopScrollBar;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLQtViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,12 +22,17 @@
 
 #include <qwidget.h>
 
-#include <ZLView.h>
 #include <ZLApplication.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
+
+class QScrollBar;
+class QFrame;
+class QGridLayout;
 
 class ZLQtApplicationWindow;
 
-class ZLQtViewWidget : public ZLViewWidget {
+class ZLQtViewWidget : public QObject, public ZLViewWidget {
+	Q_OBJECT
 
 private:
 	class ZLQtViewWidgetInternal : public QWidget {
@@ -50,19 +55,47 @@
 	
 public:
 	ZLQtViewWidget(QWidget *parent, ZLQtApplicationWindow &applicationWindow);
-	QWidget *widget();
+	QWidget *widget() const;
 
 private:
 	void repaint();
 	void trackStylus(bool track);
 
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to);
+
+	QScrollBar *addScrollBar(QGridLayout *layout, Qt::Orientation orientation, int x, int y);
+	QScrollBar *verticalScrollBar();
+	QScrollBar *horizontalScrollBar();
+
+private slots:
+	void onVerticalSliderMoved(int value);
+	void onVerticalSliderStepNext();
+	void onVerticalSliderPageNext();
+	void onVerticalSliderStepPrevious();
+	void onVerticalSliderPagePrevious();
+	void onHorizontalSliderMoved(int value);
+	void onHorizontalSliderStepNext();
+	void onHorizontalSliderPageNext();
+	void onHorizontalSliderStepPrevious();
+	void onHorizontalSliderPagePrevious();
+
 private:
 	ZLQtViewWidgetInternal *myQWidget;
+	QFrame *myFrame;
+
+	QScrollBar *myRightScrollBar;
+	QScrollBar *myLeftScrollBar;
+	bool myShowScrollBarAtRight;
+
+	QScrollBar *myBottomScrollBar;
+	QScrollBar *myTopScrollBar;
+	bool myShowScrollBarAtBottom;
+
 	ZLQtApplicationWindow &myApplicationWindow;
 
 friend class ZLQtViewWidgetInternal;
 };
 
-inline QWidget *ZLQtViewWidget::widget() { return myQWidget; }
-
 #endif /* __ZLQTVIEWWIDGET_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.cpp
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.h
--- fbreader-0.8.17/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/qtopia/view/ZLZaurusFontHack.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/unix/message/ZLUnixMessage.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/unix/message/ZLUnixMessage.cpp
--- fbreader-0.8.17/zlibrary/ui/src/unix/message/ZLUnixMessage.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/unix/message/ZLUnixMessage.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,10 +59,30 @@
 
 void ZLUnixExecMessageSender::sendStringMessage(const std::string &message) {
 	if (fork() == 0) {
+		std::string escapedMessage = message;
+		int index = 0;
+		while (true) {
+			index = escapedMessage.find('&', index);
+			if (index == -1) {
+				break;
+			}
+			escapedMessage.insert(index, "\\");
+			index += 2;
+		}
+		index = 0;
+		while (true) {
+			index = escapedMessage.find(' ', index);
+			if (index == -1) {
+				break;
+			}
+			escapedMessage.insert(index, "\\");
+			index += 2;
+		}
+
 		std::string command = myCommand;
-		int index = command.find("%1");
+		index = command.find("%1");
 		if (index >= 0) {
-			command = command.substr(0, index) + message + command.substr(index + 2);
+			command = command.substr(0, index) + escapedMessage + command.substr(index + 2);
 		}
 		system(command.c_str());
 		exit(0);
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/unix/message/ZLUnixMessage.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/unix/message/ZLUnixMessage.h
--- fbreader-0.8.17/zlibrary/ui/src/unix/message/ZLUnixMessage.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/unix/message/ZLUnixMessage.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/application/FloatingToolbar.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/FloatingToolbar.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/application/FloatingToolbar.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/FloatingToolbar.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLWin32ApplicationWindow.h"
+
+typedef LRESULT(CALLBACK *WndProc)(HWND, UINT, WPARAM, LPARAM);
+
+static LRESULT CALLBACK DockProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	switch (uMsg) {
+		case WM_NCACTIVATE:
+			return DefWindowProc(hWnd, uMsg, true, lParam);
+		case WM_COMMAND:
+		case WM_NOTIFY:
+		case WM_KEYDOWN:
+		case WM_KEYUP:
+		{
+			HWND owner = GetWindow(hWnd, GW_OWNER);
+			WndProc proc = (WndProc)GetWindowLong(owner, GWL_WNDPROC);
+			return proc(owner, uMsg, wParam, lParam);
+		}
+		case WM_CLOSE:
+			ShowWindow(hWnd, SW_HIDE);
+			return 0;
+		default:
+			return DefWindowProc(hWnd, uMsg, wParam, lParam);
+	}
+}
+
+void ZLWin32ApplicationWindow::registerFloatingToolbarClass() {
+	if (myFloatingToolbarClassRegistered) {
+		return;
+	}
+
+	WNDCLASSEX dockc;
+	dockc.cbSize = sizeof(dockc);
+	dockc.style = 0;
+	dockc.lpfnWndProc = DockProc;
+	dockc.cbClsExtra = 0;
+	dockc.cbWndExtra = 0;
+	dockc.hInstance = GetModuleHandle(0);
+	dockc.hIcon = 0;
+	dockc.hCursor = LoadCursor(0, IDC_ARROW);
+	dockc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
+	dockc.lpszMenuName = 0;
+	dockc.lpszClassName = L"FloatingToolbar";
+	dockc.hIconSm = 0;
+	RegisterClassEx(&dockc);
+
+	myFloatingToolbarClassRegistered = true;
+}
+
+void ZLWin32ApplicationWindow::createFloatingToolbar() {
+	if (!hasFullscreenToolbar()) {
+		return;
+	}
+
+	registerFloatingToolbarClass();
+
+	myDockWindow = CreateWindowEx(WS_EX_TOOLWINDOW, L"FloatingToolbar", 0, WS_CAPTION | WS_SYSMENU | WS_POPUP | WS_CLIPCHILDREN, 200, 200, 400, 164, myMainWindow, 0, GetModuleHandle(0), 0);
+  myFullscreenToolbar.hwnd = CreateWindowEx(0, TOOLBARCLASSNAME, 0, WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | CCS_NODIVIDER | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | BTNS_AUTOSIZE, 0, 0, 0, 0, myDockWindow, (HMENU)1, GetModuleHandle(0), 0);
+	SendMessage(myFullscreenToolbar.hwnd, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0);
+	SendMessage(myFullscreenToolbar.hwnd, TB_SETBITMAPSIZE, 0, MAKELONG(IconSize, IconSize));
+	SendMessage(myFullscreenToolbar.hwnd, TB_SETIMAGELIST, 0, (LPARAM)ImageList_Create(IconSize, IconSize, ILC_COLOR32 | ILC_MASK, 0, 100));
+
+	for (std::vector<ZLToolbar::ItemPtr>::const_iterator it = myFloatingToolbarItems.begin(); it != myFloatingToolbarItems.end(); ++it) {
+		addToolbarItem(*it);
+	}
+}
+
+void ZLWin32ApplicationWindow::destroyFloatingToolbar() {
+	if (myDockWindow != 0) {
+		ShowWindow(myDockWindow, SW_HIDE);
+		myFullscreenToolbar.clear();
+		DestroyWindow(myDockWindow);
+		myDockWindow = 0;
+	}
+}
+
+void ZLWin32ApplicationWindow::updateFullscreenToolbarSize() {
+	if (myDockWindow == 0) {
+		return;
+	}
+
+	RECT wRect, cRect;
+
+	int maxX = 0;
+	int maxY = 0;
+
+	const int len = SendMessage(myFullscreenToolbar.hwnd, TB_BUTTONCOUNT, 0, 0);
+	int lastVisibleIndex = -1;
+	for (int index = 0; index < len; ++index) {
+		TBBUTTON info;
+		SendMessage(myFullscreenToolbar.hwnd, TB_GETBUTTON, index, (LPARAM)&info);
+		if ((info.fsState & TBSTATE_HIDDEN) == 0) {
+			lastVisibleIndex = index;
+		}
+	}
+	if (lastVisibleIndex != -1) {
+		RECT rect;
+		SendMessage(myFullscreenToolbar.hwnd, TB_GETITEMRECT, lastVisibleIndex, (LPARAM)&rect);
+		maxX = rect.right;
+		maxY = rect.bottom;
+	}
+
+	GetWindowRect(myDockWindow, &wRect);
+	GetClientRect(myDockWindow, &cRect);
+	const int deltaX = (wRect.right - wRect.left) - (cRect.right - cRect.left);
+	const int deltaY = (wRect.bottom - wRect.top) - (cRect.bottom - cRect.top);
+	SetWindowPos(myDockWindow, HWND_TOP, 0, 0, maxX + deltaX, maxY + deltaY, SWP_NOMOVE);
+	SetWindowPos(myFullscreenToolbar.hwnd, HWND_TOP, 0, 0, maxX, maxY, SWP_NOMOVE);
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/application/Toolbar.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/Toolbar.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/application/Toolbar.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/Toolbar.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLWin32ApplicationWindow.h"
+#include "ZLWin32PopupMenu.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
+
+void ZLWin32ApplicationWindow::createWindowToolbar() {
+  myRebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, 0, WS_VISIBLE | WS_CHILD | WS_BORDER | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | CCS_NODIVIDER | CCS_NOPARENTALIGN | RBS_VARHEIGHT | RBS_BANDBORDERS, 0, 0, 0, 0, myMainWindow, (HMENU)1, GetModuleHandle(0), 0);
+
+  myWindowToolbar.hwnd = CreateWindowEx(0, TOOLBARCLASSNAME, 0, WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS | BTNS_AUTOSIZE | CCS_NORESIZE, 0, 0, 0, 0, myMainWindow, (HMENU)1, GetModuleHandle(0), 0);
+	SendMessage(myWindowToolbar.hwnd, TB_SETEXTENDEDSTYLE, 0, (LPARAM)TBSTYLE_EX_DRAWDDARROWS | TBSTYLE_EX_HIDECLIPPEDBUTTONS);
+	SendMessage(myWindowToolbar.hwnd, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0);
+	SendMessage(myWindowToolbar.hwnd, TB_SETBITMAPSIZE, 0, MAKELONG(IconSize, IconSize));
+	SendMessage(myWindowToolbar.hwnd, TB_SETINDENT, 3, 0);
+	SendMessage(myWindowToolbar.hwnd, TB_SETIMAGELIST, 0, (LPARAM)ImageList_Create(IconSize, IconSize, ILC_COLOR32 | ILC_MASK, 0, 100));
+
+	ZeroMemory(&myToolbarInfo, sizeof(myToolbarInfo));
+	myToolbarInfo.cbSize = sizeof(myToolbarInfo);
+	myToolbarInfo.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_IDEALSIZE | RBBIM_ID; 
+	myToolbarInfo.fStyle = RBBS_USECHEVRON | RBBS_NOGRIPPER;
+	myToolbarInfo.hwndChild = myWindowToolbar.hwnd;
+	myToolbarInfo.wID = 1;
+	myToolbarInfo.cxMinChild = 0;
+	myToolbarInfo.cyIntegral = 1;
+	myToolbarInfo.cyMinChild = 44;
+	myToolbarInfo.cyMaxChild = 44;
+	myToolbarInfo.cx = 0;
+	myToolbarInfo.cxIdeal = 0;
+	SendMessage(myRebar, RB_INSERTBAND, (WPARAM)0, (LPARAM)&myToolbarInfo);
+	myToolbarInfo.fMask = RBBIM_SIZE | RBBIM_IDEALSIZE; 
+}
+
+void ZLWin32ApplicationWindow::updateWindowToolbarInfo() {
+	if (myToolbarInfo.cxIdeal != 0) {
+		return;
+	}
+
+	const int len = SendMessage(myWindowToolbar.hwnd, TB_BUTTONCOUNT, 0, 0);
+	int lastVisibleIndex = -1;
+	for (int index = 0; index < len; ++index) {
+		TBBUTTON info;
+		SendMessage(myWindowToolbar.hwnd, TB_GETBUTTON, index, (LPARAM)&info);
+		if ((info.fsState & TBSTATE_HIDDEN) == 0) {
+			lastVisibleIndex = index;
+		}
+	}
+	if (lastVisibleIndex != -1) {
+		RECT rect;
+		SendMessage(myWindowToolbar.hwnd, TB_GETITEMRECT, lastVisibleIndex, (LPARAM)&rect);
+		myToolbarInfo.cxIdeal = rect.right;
+		myToolbarInfo.cx = rect.right;
+	}
+  
+	SendMessage(myRebar, RB_SETBANDINFO, 0, (LPARAM)&myToolbarInfo);
+}
+
+void ZLWin32ApplicationWindow::processChevron(const NMREBARCHEVRON &chevron) {
+	RECT toolbarRect;
+	GetClientRect(myWindowToolbar.hwnd, &toolbarRect);
+
+	HIMAGELIST imageList = (HIMAGELIST)SendMessage(myWindowToolbar.hwnd, TB_GETIMAGELIST, 0, 0);
+	int imageIndex = 0;
+
+	const int len = SendMessage(myWindowToolbar.hwnd, TB_BUTTONCOUNT, 0, 0);
+	int index = 0;
+	for (; index < len; ++index) {
+		TBBUTTON info;
+		SendMessage(myWindowToolbar.hwnd, TB_GETBUTTON, index, (LPARAM)&info);
+		if ((info.fsState & TBSTATE_HIDDEN) == 0) {
+			RECT rect;
+			SendMessage(myWindowToolbar.hwnd, TB_GETITEMRECT, index, (LPARAM)&rect);
+			if (rect.right > toolbarRect.right) {
+				break;
+			}
+		}
+		if (info.idCommand > -100) {
+			++imageIndex;
+		}
+	}
+
+	myPopupMenu = new ZLWin32PopupMenu(myMainWindow);
+	for (; index < len; ++index) {
+		TBBUTTON info;
+		SendMessage(myWindowToolbar.hwnd, TB_GETBUTTON, index, (LPARAM)&info);
+		if ((info.fsState & TBSTATE_HIDDEN) == 0) {
+			ZLToolbar::ItemPtr item = myWindowToolbar.TBItemByActionCode[info.idCommand];
+			if (!item.isNull()) {
+				const ZLToolbar::AbstractButtonItem &button =
+					(const ZLToolbar::AbstractButtonItem&)*item;
+				myPopupMenu->addItem(
+					"  " + button.tooltip(),
+					ImageList_GetIcon(imageList, imageIndex, ILD_NORMAL),
+					info.fsState & TBSTATE_ENABLED,
+					info.idCommand
+				);
+			} else if (info.idCommand >= -200) /* is a separator */ {
+				myPopupMenu->addSeparator();
+			}
+		}
+		if (info.idCommand > -100) {
+			++imageIndex;
+		}
+	}
+	POINT p;
+	p.x = chevron.rc.right - 2;
+	p.y = chevron.rc.bottom;
+	ClientToScreen(myMainWindow, &p);
+	onToolbarButtonRelease(myPopupMenu->run(p, true));
+	myPopupMenu.reset();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,74 +19,58 @@
 
 #include <windowsx.h>
 
+#define RBN_CHEVRONPUSHED (RBN_FIRST - 10)
+#define MY_WM_FULLSCREEN (WM_USER + 200)
+
 #include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 #include <ZLFile.h>
 #include <ZLOptionEntry.h>
 #include <ZLDialog.h>
 #include <ZLPaintContext.h>
+#include <ZLPopupData.h>
 
-#include "../../../../core/src/util/ZLKeyUtil.h"
 #include "ZLWin32ApplicationWindow.h"
+#include "ZLWin32PopupMenu.h"
+#include "../../../../core/src/util/ZLKeyUtil.h"
 #include "../dialogs/ZLWin32DialogManager.h"
 #include "../view/ZLWin32ViewWidget.h"
 #include "../../../../core/src/win32/util/W32WCHARUtil.h"
 #include "../time/ZLWin32Time.h"
 
-const int ICON_SIZE = 32;
+const int ZLWin32ApplicationWindow::IconSize = 32;
 
 ZLWin32ApplicationWindow *ZLWin32ApplicationWindow::ourApplicationWindow = 0;
 
-int ZLWin32ApplicationWindow::x(WPARAM lParam) {
-	return LOWORD(lParam);
+static HWND getTextItem(HWND comboBox) {
+	COMBOBOXINFO cbi;
+	ZeroMemory(&cbi, sizeof(cbi));
+	cbi.cbSize = sizeof(cbi);
+	GetComboBoxInfo(comboBox, &cbi);
+	return cbi.hwndItem;
 }
 
-int ZLWin32ApplicationWindow::y(WPARAM lParam) {
-	return HIWORD(lParam) - ourApplicationWindow->topOffset();
-}
-
-LRESULT CALLBACK ZLWin32ApplicationWindow::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+LRESULT CALLBACK ZLWin32ApplicationWindow::Callback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	return ourApplicationWindow->mainLoopCallback(hWnd, uMsg, wParam, lParam);
 }
 
 LRESULT ZLWin32ApplicationWindow::mainLoopCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	switch (uMsg) {
-		case WM_TIMER:
-			((ZLWin32TimeManager&)ZLTimeManager::instance()).execute(wParam);
-			return 0;
-		case WM_CREATE:
-			myMainWindow = hWnd;
-			ZLApplicationWindow::init();
-			return DefWindowProc(hWnd, uMsg, wParam, lParam);
-		case WM_LBUTTONDOWN:
-			if (!myBlockMouseEvents) {
-				if (myWin32ViewWidget->myMouseCaptured) {
-					SetCapture(myMainWindow);
-				}
-				myWin32ViewWidget->onMousePress(x(lParam), y(lParam));
-			}
-			return 0;
-		case WM_LBUTTONUP:
-			if (!myBlockMouseEvents) {
-				myWin32ViewWidget->onMouseRelease(x(lParam), y(lParam));
-			}
-			if (myMainWindow == GetCapture()) {
-				ReleaseCapture();
-			}
+		case MY_WM_FULLSCREEN:
+			setFullscreen(true);
 			return 0;
-		case WM_MOUSEMOVE:
-			if (!myBlockMouseEvents) {
-				if (wParam & MK_LBUTTON) {
-					myWin32ViewWidget->onMouseMovePressed(x(lParam), y(lParam));
-				} else {
-					myWin32ViewWidget->onMouseMove(x(lParam), y(lParam));
-				}
+		case WM_MEASUREITEM:
+			if (!myPopupMenu.isNull()) {
+				myPopupMenu->measureItem(*(MEASUREITEMSTRUCT*)lParam);
+			}
+			return 1;
+		case WM_DRAWITEM:
+			if (!myPopupMenu.isNull()) {
+				myPopupMenu->drawItem(*(DRAWITEMSTRUCT*)lParam);
 			}
-			if (myCursor != 0) {
-				SetCursor(myCursor);
-			}
-			return 0;
+			return 1;
 		case WM_MOUSEWHEEL:
-			if (!myBlockMouseEvents) {
+			if (!mouseEventsAreBlocked()) {
 				application().doActionByKey(
 					((short)HIWORD(wParam) > 0) ?
 						ZLApplication::MouseScrollUpKey :
@@ -94,7 +78,22 @@
 				);
 			}
 			return 0;
+		case WM_PAINT:
+		{
+			LRESULT code = DefWindowProc(hWnd, uMsg, wParam, lParam);
+			updateWindowToolbarInfo();
+			updateFullscreenToolbarSize();
+			return code;
+		}
+		case WM_TIMER:
+			((ZLWin32TimeManager&)ZLTimeManager::instance()).execute(wParam);
+			return 0;
+		case WM_CREATE:
+			myMainWindow = hWnd;
+			ZLApplicationWindow::init();
+			return DefWindowProc(hWnd, uMsg, wParam, lParam);
 		case WM_KEYDOWN:
+		case WM_SYSKEYDOWN:
 			if (wParam == 0x10) {
 				myKeyboardModifierMask |= 0x1;
 			} else if (wParam == 0x11) {
@@ -107,6 +106,7 @@
 			}
 			return 0;
 		case WM_KEYUP:
+		case WM_SYSKEYUP:
 			if (wParam == 0x10) {
 				myKeyboardModifierMask &= ~0x1;
 			} else if (wParam == 0x11) {
@@ -116,15 +116,17 @@
 			}
 			return 0;
 		case WM_SIZE:
-			if (myToolbar != 0) {
-				SendMessage(myToolbar, TB_AUTOSIZE, 0, 0);
+		{
+			RECT rebarRect;
+			GetWindowRect(myRebar, &rebarRect);
+			int offset = rebarRect.bottom - rebarRect.top - 1;
+			MoveWindow(myRebar, 0, 0, LOWORD(lParam), rebarRect.bottom - rebarRect.top, true);
+			if (myFullScreen) {
+				offset = 0;
 			}
+			MoveWindow(myWin32ViewWidget->handle(), 0, offset, LOWORD(lParam), HIWORD(lParam) - offset, true);
 			return DefWindowProc(hWnd, uMsg, wParam, lParam);
-		case WM_ERASEBKGND:
-			return 0;
-		case WM_PAINT:
-			myWin32ViewWidget->doPaint();
-			return 0;
+		}
 		case WM_CLOSE:
 			if (myFullScreen) {
 				myWindowStateOption.setValue(FULLSCREEN);
@@ -145,26 +147,24 @@
 			PostQuitMessage(0);
 			return 0;
 		case WM_COMMAND:
-			onToolbarButtonPress(LOWORD(wParam));
+			onToolbarButtonRelease(LOWORD(wParam));
 			return 0;
 		case WM_NOTIFY:
 		{
 			const NMHDR *notificationHeader = (const NMHDR*)lParam;
 			switch (notificationHeader->code) {
 				case TTN_NEEDTEXT:
-				{
-					TOOLTIPTEXT &tooltip = *(TOOLTIPTEXT*)lParam;
-					ZLApplication::Toolbar::ItemPtr item = myButtonByActionCode[tooltip.hdr.idFrom];
-					if (!item.isNull()) {
-						const ZLApplication::Toolbar::ButtonItem &button =
-							(const ZLApplication::Toolbar::ButtonItem&)*item;
-						ZLUnicodeUtil::Ucs2String tooltipBuffer;
-						::createNTWCHARString(tooltipBuffer, button.tooltip());
-						size_t length = std::max(tooltipBuffer.size(), (size_t)80);
-						memcpy((char*)tooltip.szText, (char*)::wchar(tooltipBuffer), 2 * length);
-						tooltip.uFlags = TTF_DI_SETITEM;
-					}
-				}
+					setTooltip(*(TOOLTIPTEXT*)lParam);
+					break;
+				case NM_CUSTOMDRAW:
+					updateParameters();
+					break;
+				case TBN_DROPDOWN:
+					runPopup(*(const NMTOOLBAR*)lParam);
+					break;
+				case RBN_CHEVRONPUSHED:
+					processChevron(*(const NMREBARCHEVRON*)lParam);
+					break;
 			}
 			return 0;
 		}
@@ -173,27 +173,84 @@
 	}
 }
 
-static const std::string OPTIONS = "Options";
+void ZLWin32ApplicationWindow::setTooltip(TOOLTIPTEXT &tooltip) {
+	Toolbar &tb = toolbar(isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR);
+	if (tb.hwnd == 0) {
+		return;
+	}
+	ZLToolbar::ItemPtr item = tb.TBItemByActionCode[tooltip.hdr.idFrom];
+	if (!item.isNull()) {
+		const ZLToolbar::AbstractButtonItem &button =
+			(const ZLToolbar::AbstractButtonItem&)*item;
+		ZLUnicodeUtil::Ucs2String tooltipBuffer;
+		::createNTWCHARString(tooltipBuffer, button.tooltip());
+		size_t length = std::max(tooltipBuffer.size(), (size_t)80);
+		memcpy((char*)tooltip.szText, (char*)::wchar(tooltipBuffer), 2 * length);
+		tooltip.uFlags = TTF_DI_SETITEM;
+	}
+}
+
+void ZLWin32ApplicationWindow::runPopup(const NMTOOLBAR &nmToolbar) {
+	Toolbar &tb = toolbar(isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR);
+	if (tb.hwnd == 0) {
+		return;
+	}
+	ZLToolbar::ItemPtr item = tb.TBItemByActionCode[nmToolbar.iItem];
+	if (!item.isNull()) {
+		const ZLToolbar::MenuButtonItem &button =
+			(const ZLToolbar::MenuButtonItem&)*item;
+		shared_ptr<ZLPopupData> popupData = button.popupData();
+		if (!popupData.isNull()) {
+			const int count = popupData->count();
+			if (count != 0) {
+				myPopupMenu = new ZLWin32PopupMenu(myMainWindow);
+				for (int i = 0; i < count; ++i) {
+					myPopupMenu->addItem(popupData->text(i), 0, true);
+				}
+				POINT p;
+				p.x = nmToolbar.rcButton.left;
+				p.y = nmToolbar.rcButton.bottom + 6;
+				ClientToScreen(myMainWindow, &p);
+				int code = myPopupMenu->run(p);
+				if (code > 0) {
+					popupData->run(code - 1);
+				}
+				myPopupMenu.reset();
+			}
+		}
+	}
+}
 
 ZLWin32ApplicationWindow::ZLWin32ApplicationWindow(ZLApplication *application) :
 	ZLDesktopApplicationWindow(application),
 	myMainWindow(0),
-	myToolbar(0),
+	myRebar(0),
+	myDockWindow(0),
+	myFloatingToolbarClassRegistered(false),
 	myBlockMouseEvents(false),
 	myKeyboardModifierMask(0),
 	myFullScreen(false),
 	myWait(false),
 	myCursor(0) {
 
+	::createNTWCHARString(myClassName, ZLibrary::ApplicationName());
+
+	HWND existingWindow = FindWindow(::wchar(myClassName), 0);
+	if (existingWindow != 0) {
+		ShowWindow(existingWindow, SW_SHOW);
+		SetForegroundWindow(existingWindow);
+		exit(0);
+	}
+
 	INITCOMMONCONTROLSEX icex;
 	icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
-	icex.dwICC = ICC_WIN95_CLASSES;
+	icex.dwICC = ICC_WIN95_CLASSES | ICC_BAR_CLASSES | ICC_COOL_CLASSES | ICC_USEREX_CLASSES;
 	InitCommonControlsEx(&icex);
 
 	WNDCLASSEX wc;
 	wc.cbSize = sizeof(wc);
 	wc.style = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc = WndProc;
+	wc.lpfnWndProc = Callback;
 	wc.cbClsExtra = 0;
 	wc.cbWndExtra = 0;
 	wc.hInstance = GetModuleHandle(0);
@@ -201,7 +258,7 @@
 	wc.hCursor = LoadCursor(0, IDC_ARROW);
 	wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH);
 	wc.lpszMenuName = 0;
-	wc.lpszClassName = ::wchar(::createNTWCHARString(myClassName, ZLibrary::ApplicationName()));
+	wc.lpszClassName = ::wchar(myClassName);
 	wc.hIconSm = wc.hIcon;
 
 	RegisterClassEx(&wc);
@@ -211,7 +268,8 @@
 
 void ZLWin32ApplicationWindow::init() {
 	const WCHAR *aName = ::wchar(myClassName);
-	CreateWindow(aName, aName, WS_OVERLAPPEDWINDOW, myXOption.value(), myYOption.value(), myWidthOption.value(), myHeightOption.value(), (HWND)0, (HMENU)0, GetModuleHandle(0), 0);
+	const DWORD layoutStyle = ZLLanguageUtil::isRTLLanguage(ZLibrary::Language()) ? WS_EX_LAYOUTRTL : 0;
+	CreateWindowEx(layoutStyle, aName, aName, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, myXOption.value(), myYOption.value(), myWidthOption.value(), myHeightOption.value(), (HWND)0, (HMENU)0, GetModuleHandle(0), 0);
 
 	// TODO: Hmm, replace SW_SHOWDEFAULT by nCmdShow?
 	ShowWindow(myMainWindow, SW_SHOWDEFAULT);
@@ -220,7 +278,7 @@
 		case NORMAL:
 			break;
 		case FULLSCREEN:
-			setFullscreen(true);
+			PostMessage(myMainWindow, MY_WM_FULLSCREEN, 0, 0);
 			break;
 		case MAXIMIZED:
 			ShowWindow(myMainWindow, SW_SHOWMAXIMIZED);
@@ -228,16 +286,50 @@
 	}
 }
 
+void ZLWin32ApplicationWindow::refresh() {
+	ZLDesktopApplicationWindow::refresh();
+
+	if (!isFullscreen()) {
+		myToolbarInfo.cxIdeal = 0;
+	}
+}
+
+void ZLWin32ApplicationWindow::processAllEvents() {
+	// TODO: implement
+}
+
 ZLWin32ApplicationWindow::~ZLWin32ApplicationWindow() {
 	ourApplicationWindow = 0;
 }
 
-void ZLWin32ApplicationWindow::setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button) {
-	PostMessage(myToolbar, TB_CHECKBUTTON, myActionCodeById[button.actionId()], button.isPressed());
+void ZLWin32ApplicationWindow::setToggleButtonState(const ZLToolbar::ToggleButtonItem &button) {
+	Toolbar &tb = toolbar(type(button));
+	if (tb.hwnd == 0) {
+		return;
+	}
+
+	PostMessage(tb.hwnd, TB_CHECKBUTTON, tb.ActionCodeById[button.actionId()], button.isPressed());
 }
 
-void ZLWin32ApplicationWindow::onToolbarButtonPress(int actionCode) {
-	onButtonPress((ZLApplication::Toolbar::ButtonItem&)*myButtonByActionCode[actionCode]);
+void ZLWin32ApplicationWindow::onToolbarButtonRelease(int actionCode) {
+	Toolbar &tb = toolbar(isFullscreen() ? FULLSCREEN_TOOLBAR : WINDOW_TOOLBAR);
+	if (tb.hwnd == 0) {
+		return;
+	}
+	std::map<int,ZLToolbar::ItemPtr>::const_iterator it = tb.TBItemByActionCode.find(actionCode);
+	if ((it == tb.TBItemByActionCode.end()) || it->second.isNull()) {
+		return;
+	}
+		
+	switch (it->second->type()) {
+		default:
+			break;
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+			onButtonPress((ZLToolbar::AbstractButtonItem&)*it->second);
+			break;
+	}
 }
 
 void ZLWin32ApplicationWindow::setFullscreen(bool fullscreen) {
@@ -251,82 +343,233 @@
 	static WINDOWPLACEMENT toolbarPlacement;
 	if (myFullScreen) {
 		GetWindowPlacement(myMainWindow, &mainPlacement);
-		GetWindowPlacement(myToolbar, &toolbarPlacement);
-		ShowWindow(myMainWindow, SW_SHOWMAXIMIZED);
-		ShowWindow(myToolbar, SW_HIDE);
+		GetWindowPlacement(myRebar, &toolbarPlacement);
 		SetWindowLong(myMainWindow, GWL_STYLE, style & ~WS_CAPTION);
+		int cx;
+		int cy;
+		HDC displayDC = GetDC(0);
+		if (displayDC != 0) {
+			cx = GetDeviceCaps(displayDC, HORZRES);
+			cy = GetDeviceCaps(displayDC, VERTRES);
+			ReleaseDC(0, displayDC);
+		} else {
+			cx = GetSystemMetrics(SM_CXSCREEN);
+			cy = GetSystemMetrics(SM_CYSCREEN);
+		}
+		SetWindowPos(myMainWindow, HWND_TOP, 0, 0, cx, cy, SWP_SHOWWINDOW);
+		ShowWindow(myMainWindow, SW_SHOWMAXIMIZED);
+		ShowWindow(myRebar, SW_HIDE);
+		createFloatingToolbar();
+		if (myDockWindow != 0) {
+			ShowWindow(myDockWindow, SW_SHOWDEFAULT);
+			updateFullscreenToolbarSize();
+		}
 	} else {
 		SetWindowLong(myMainWindow, GWL_STYLE, style | WS_CAPTION);
-		ShowWindow(myToolbar, SW_SHOWNORMAL);
+		ShowWindow(myRebar, SW_SHOWNORMAL);
 		ShowWindow(myMainWindow, SW_SHOWNORMAL);
 		SetWindowPlacement(myMainWindow, &mainPlacement);
-		SetWindowPlacement(myToolbar, &toolbarPlacement);
+		SetWindowPlacement(myRebar, &toolbarPlacement);
+
+		RECT mainRect;
+		GetClientRect(myMainWindow, &mainRect);
+		RECT rebarRect;
+		GetWindowRect(myRebar, &rebarRect);
+		MoveWindow(myRebar, 0, 0, mainRect.right - mainRect.left, rebarRect.bottom - rebarRect.top, true);
+
+		destroyFloatingToolbar();
 	}
-	myWin32ViewWidget->repaint();
+	refresh();
 }
 
 bool ZLWin32ApplicationWindow::isFullscreen() const {
 	return myFullScreen;
 }
 
-void ZLWin32ApplicationWindow::addToolbarItem(ZLApplication::Toolbar::ItemPtr item) {
-	if (myToolbar == 0) {
-  	//myToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, 0, WS_VISIBLE | WS_CHILD | WS_BORDER | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, 0, 0, 0, 0, myMainWindow, (HMENU)1, GetModuleHandle(0), 0);
-  	myToolbar = CreateWindowEx(0, TOOLBARCLASSNAME, 0, WS_VISIBLE | WS_CHILD | WS_BORDER | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, 0, 0, 0, 0, myMainWindow, (HMENU)1, GetModuleHandle(0), 0);
-		SendMessage(myToolbar, TB_BUTTONSTRUCTSIZE, (WPARAM)sizeof(TBBUTTON), 0);
-		SendMessage(myToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(ICON_SIZE, ICON_SIZE));
-		SendMessage(myToolbar, TB_SETINDENT, 3, 0);
-		SendMessage(myToolbar, TB_SETIMAGELIST, 0, (LPARAM)ImageList_Create(ICON_SIZE, ICON_SIZE, ILC_COLOR32 | ILC_MASK, 0, 100));
+void ZLWin32ApplicationWindow::addToolbarItem(ZLToolbar::ItemPtr item) {
+	if (myRebar == 0) {
+		createWindowToolbar();
+	}
+
+	Toolbar &tb = toolbar(type(*item));
+	if (tb.hwnd == 0) {
+		myFloatingToolbarItems.push_back(item);
+		return;
 	}
 
 	TBBUTTON button;
 	button.fsState = TBSTATE_ENABLED;
-	if (item->type() == ZLApplication::Toolbar::Item::BUTTON) {
-		static int buttonCounter = 0;
-		const ZLApplication::Toolbar::ButtonItem &buttonItem = (const ZLApplication::Toolbar::ButtonItem&)*item;
-
-		std::string imageFileName = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter + buttonItem.iconName() + ".ico";
-		ZLFile file(imageFileName);
-		HICON bitmap = (HICON)LoadImageA(0, file.path().c_str(), IMAGE_ICON, ICON_SIZE, ICON_SIZE, LR_LOADFROMFILE);
-		/*
-		if (bitmap == 0) {
-			HDC dc = GetDC(myToolbar);
-			bitmap = CreateCompatibleBitmap(dc, ICON_SIZE, ICON_SIZE);
-			ReleaseDC(myToolbar, dc);
-		}
-		*/
-		ImageList_AddIcon((HIMAGELIST)SendMessage(myToolbar, TB_GETIMAGELIST, 0, 0), bitmap);
-
-		button.iBitmap = buttonCounter;
-		button.fsStyle = buttonItem.isToggleButton() ? TBSTYLE_CHECK : TBSTYLE_BUTTON;
-		const int actionCode = myActionCodeById.size() + 1;
-		myActionCodeById[buttonItem.actionId()] = actionCode;
-		button.idCommand = actionCode;
-		myButtonByActionCode[button.idCommand] = item;
-		button.dwData = 0;
-		button.iString = 0;
+	const ZLToolbar::Item::Type type = item->type();
+	switch (type) {
+		case ZLToolbar::Item::TEXT_FIELD:
+		case ZLToolbar::Item::COMBO_BOX:
+		{
+			const ZLToolbar::ParameterItem &textFieldItem = (ZLToolbar::ParameterItem&)*item;
+			button.idCommand = -200 + tb.ParameterCodeById.size();
+			tb.ParameterCodeById[textFieldItem.actionId()] = button.idCommand;
+			button.iBitmap = I_IMAGENONE;
+			button.fsStyle = TBSTYLE_BUTTON | BTNS_AUTOSIZE | BTNS_SHOWTEXT;
+			button.fsState = 0;
+			tb.TBItemByActionCode[button.idCommand] = item;
+			break;
+		}
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+		{
+			const ZLToolbar::AbstractButtonItem &buttonItem = (const ZLToolbar::AbstractButtonItem&)*item;
+    
+			std::string imageFileName = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter + buttonItem.iconName() + ".ico";
+			ZLFile file(imageFileName);
+			ZLUnicodeUtil::Ucs2String wPath;
+			HICON bitmap = (HICON)LoadImageW(0, ::wchar(::createNTWCHARString(wPath, file.path())), IMAGE_ICON, IconSize, IconSize, LR_LOADFROMFILE);
+			ImageList_AddIcon((HIMAGELIST)SendMessage(tb.hwnd, TB_GETIMAGELIST, 0, 0), bitmap);
+    
+			button.iBitmap = tb.ActionCodeById.size();
+			button.fsStyle = TBSTYLE_BUTTON;
+			if (type == ZLToolbar::Item::MENU_BUTTON) {
+				button.fsStyle |= TBSTYLE_DROPDOWN;
+			} else if (type == ZLToolbar::Item::TOGGLE_BUTTON) {
+				button.fsStyle |= TBSTYLE_CHECK;
+			}
+			const int actionCode = tb.ActionCodeById.size() + 1;
+			tb.ActionCodeById[buttonItem.actionId()] = actionCode;
+			button.idCommand = actionCode;
+			tb.TBItemByActionCode[button.idCommand] = item;
+			button.dwData = 0;
+			button.iString = 0;
+    
+			break;
+		}
+		case ZLToolbar::Item::SEPARATOR:
+		{
+			button.idCommand = -100 - tb.SeparatorNumbers.size();
+			tb.SeparatorNumbers[item] = button.idCommand;
+			button.iBitmap = 6;
+			button.fsStyle = TBSTYLE_SEP;
+			break;
+		}
+	}
+	SendMessage(tb.hwnd, TB_ADDBUTTONS, 1, (LPARAM)&button);
 
-		++buttonCounter;
-	} else {
-		static int separatorCounter = -100;
-		button.idCommand = --separatorCounter;
-		mySeparatorNumbers[item] = button.idCommand;
-		button.iBitmap = 6;
-		button.fsStyle = TBSTYLE_SEP;
-	}
-	SendMessage(myToolbar, TB_ADDBUTTONS, 1, (LPARAM)&button);
-}
-
-void ZLWin32ApplicationWindow::setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled) {
-	if (item->type() == ZLApplication::Toolbar::Item::BUTTON) {
-		const ZLApplication::Toolbar::ButtonItem &buttonItem = (const ZLApplication::Toolbar::ButtonItem&)*item;
-		LPARAM state = (visible ? 0 : TBSTATE_HIDDEN) | (enabled ? TBSTATE_ENABLED : 0);
-		PostMessage(myToolbar, TB_SETSTATE, (WPARAM)myActionCodeById[buttonItem.actionId()], state);
-		if (buttonItem.isToggleButton()) {
-			setToggleButtonState(buttonItem);
+	switch (type) {
+		default:
+			break;
+		case ZLToolbar::Item::TEXT_FIELD:
+		case ZLToolbar::Item::COMBO_BOX:
+		{
+			const ZLToolbar::ParameterItem &textFieldItem = (ZLToolbar::ParameterItem&)*item;
+			TBBUTTONINFO buttonInfo;
+			buttonInfo.cbSize = sizeof(TBBUTTONINFO);
+			buttonInfo.dwMask = TBIF_SIZE;
+			buttonInfo.cx = 10 + 8 * textFieldItem.maxWidth();
+			if (type == ZLToolbar::Item::COMBO_BOX) {
+				buttonInfo.cx += 15;
+			}
+			SendMessage(tb.hwnd, TB_SETBUTTONINFO, button.idCommand, (LPARAM)&buttonInfo);
+			TextEditParameter *parameter = new TextEditParameter(application(), myMainWindow, tb.hwnd, button.idCommand, textFieldItem);
+			addVisualParameter(textFieldItem.parameterId(), parameter);
+			myParameters[button.idCommand] = parameter->handle();
+			break;
 		}
-	} else {
-		PostMessage(myToolbar, TB_SETSTATE, mySeparatorNumbers[item], visible ? 0 : TBSTATE_HIDDEN);
+	}
+}
+
+LRESULT CALLBACK ZLWin32ApplicationWindow::TextEditParameter::ComboBoxCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	TextEditParameter &parameter =
+		*(TextEditParameter*)GetWindowLong(hWnd, GWL_USERDATA);
+
+	if ((uMsg == WM_COMMAND) && (HIWORD(wParam) == CBN_SELCHANGE)) {
+		HWND comboBox = parameter.myComboBox;
+		const int index = SendMessage(comboBox, CB_GETCURSEL, 0, 0);
+		const int length = SendMessage(comboBox, CB_GETLBTEXTLEN, index, 0);
+		ZLUnicodeUtil::Ucs2String buffer;
+		if (length > 0) {
+			buffer.assign(length + 1, '\0');
+			SendMessage(comboBox, CB_GETLBTEXT, index, (LPARAM)&buffer.front());
+			buffer.pop_back();
+		}
+		std::string value;
+		ZLUnicodeUtil::ucs2ToUtf8(value, buffer);
+		parameter.setValue(value);
+
+		parameter.myApplication.doAction(parameter.myParameterItem.actionId());
+		SetFocus(parameter.myMainWindow);
+	}
+
+	WndProc orig = parameter.myOriginalComboBoxCallback;
+	return orig(hWnd, uMsg, wParam, lParam);
+}
+
+LRESULT CALLBACK ZLWin32ApplicationWindow::TextEditParameter::TextEditCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	TextEditParameter &parameter =
+		*(TextEditParameter*)GetWindowLong(hWnd, GWL_USERDATA);
+
+	if (uMsg == WM_CHAR) {
+		if (wParam == 13) {
+			parameter.myApplication.doAction(parameter.myParameterItem.actionId());
+			SetFocus(parameter.myMainWindow);
+			return 0;
+		} else if (wParam == 27) {
+			parameter.restoreOldValue();
+			SetFocus(parameter.myMainWindow);
+			return 0;
+		}
+	}
+	WndProc orig = parameter.myOriginalTextEditCallback;
+	return orig(hWnd, uMsg, wParam, lParam);
+}
+
+void ZLWin32ApplicationWindow::updateParameters() {
+	const size_t len = myWindowToolbar.ParameterCodeById.size();
+	for (size_t i = 0; i < len; ++i) {
+		const size_t idCommand = -200 + i;
+		if (myParameters[idCommand] != 0) {
+			RECT rect;
+			const int index = SendMessage(myWindowToolbar.hwnd, TB_COMMANDTOINDEX, idCommand, 0);
+			SendMessage(myWindowToolbar.hwnd, TB_GETITEMRECT, index, (LPARAM)&rect);
+			SetWindowPos(
+				myParameters[idCommand], 0, rect.left + 5, rect.top + 8, 0, 0,
+				SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOSIZE
+			);
+		}
+	}
+}
+
+void ZLWin32ApplicationWindow::setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled) {
+	Toolbar &tb = toolbar(type(*item));
+	if (tb.hwnd == 0) {
+		return;
+	}
+
+	const ZLToolbar::Item::Type type = item->type();
+	switch (type) {
+		case ZLToolbar::Item::TEXT_FIELD:
+		case ZLToolbar::Item::COMBO_BOX:
+		{
+			const ZLToolbar::ParameterItem &textFieldItem = (const ZLToolbar::ParameterItem&)*item;
+			HWND handle = myParameters[tb.ParameterCodeById[textFieldItem.actionId()]];
+			if (handle != 0) {
+				const int idCommand = tb.ParameterCodeById[textFieldItem.actionId()];
+				PostMessage(tb.hwnd, TB_SETSTATE, idCommand, visible ? 0 : TBSTATE_HIDDEN);
+				ShowWindow(handle, visible ? SW_SHOW : SW_HIDE);
+				PostMessage(handle, EM_SETREADONLY, !enabled, 0);
+			}
+			break;
+		}
+		case ZLToolbar::Item::PLAIN_BUTTON:
+		case ZLToolbar::Item::MENU_BUTTON:
+		case ZLToolbar::Item::TOGGLE_BUTTON:
+		{
+			ZLToolbar::AbstractButtonItem &buttonItem = (ZLToolbar::AbstractButtonItem&)*item;
+			LPARAM state = (visible ? 0 : TBSTATE_HIDDEN) | (enabled ? TBSTATE_ENABLED : 0);
+			const int idCommand = tb.ActionCodeById[buttonItem.actionId()];
+			PostMessage(tb.hwnd, TB_SETSTATE, (WPARAM)idCommand, state);
+			break;
+		}
+		case ZLToolbar::Item::SEPARATOR:
+			PostMessage(tb.hwnd, TB_SETSTATE, tb.SeparatorNumbers[item], visible ? 0 : TBSTATE_HIDDEN);
+			break;
 	}
 }
 
@@ -350,23 +593,14 @@
 	return myMainWindow;
 }
 
-int ZLWin32ApplicationWindow::topOffset() const {
-	if ((myToolbar != 0) && (!myFullScreen)) {
-		RECT toolbarRectangle;
-		GetWindowRect(myToolbar, &toolbarRectangle);
-		POINT p;
-		p.x = toolbarRectangle.right;
-		p.y = toolbarRectangle.bottom;
-		ScreenToClient(myMainWindow, &p);
-		return p.y;
-	}
-	return 0;
-}
-
 void ZLWin32ApplicationWindow::blockMouseEvents(bool block) {
 	myBlockMouseEvents = block;
 }
 
+bool ZLWin32ApplicationWindow::mouseEventsAreBlocked() const {
+	return myBlockMouseEvents;
+}
+
 void ZLWin32ApplicationWindow::setHyperlinkCursor(bool hyperlink) {
 	static HCURSOR handCursor = LoadCursor(0, IDC_HAND);
 	myCursor = hyperlink ? handCursor : 0;
@@ -378,3 +612,114 @@
 	SetCursor(myCursor);
 	myWait = wait;
 }
+
+static void addTooltipToWindow(HWND window, const std::string &tooltip) {
+	HWND tooltipHandle = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, 0, WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, window, 0, GetModuleHandle(0), 0);
+	TOOLINFO tti;
+	tti.cbSize = sizeof(tti);
+	tti.uFlags = TTF_SUBCLASS;
+	tti.hwnd = window;
+	tti.hinst = GetModuleHandle(0);
+	tti.uId = 0;
+	ZLUnicodeUtil::Ucs2String buffer;
+	::createNTWCHARString(buffer, tooltip);
+	tti.lpszText = (WCHAR*)::wchar(buffer);
+	GetClientRect(window, &tti.rect);
+	SendMessage(tooltipHandle, TTM_ADDTOOL, 0, (LPARAM)&tti);
+}
+
+ZLWin32ApplicationWindow::TextEditParameter::TextEditParameter(ZLApplication &application, HWND mainWindow, HWND toolbar, int idCommand, const ZLToolbar::ParameterItem &item) : myApplication(application), myMainWindow(mainWindow), myParameterItem(item) {
+	const int index = SendMessage(toolbar, TB_COMMANDTOINDEX, idCommand, 0);
+	RECT rect;
+	SendMessage(toolbar, TB_GETITEMRECT, index, (LPARAM)&rect);
+	DWORD style = WS_CHILD | WS_VISIBLE | WS_BORDER;
+	if (item.type() == ZLToolbar::Item::COMBO_BOX) {
+		style |= CBS_DROPDOWN | WS_VSCROLL;
+	}
+	myComboBox = CreateWindow(WC_COMBOBOX, 0, style, rect.left + 5, rect.top + 8, rect.right - rect.left - 10, rect.bottom - rect.top - 14, toolbar, (HMENU)idCommand, GetModuleHandle(0), 0);
+	HWND textItem = getTextItem(myComboBox);
+	DWORD textItemStyle = GetWindowLong(textItem, GWL_STYLE);
+	textItemStyle |= ES_CENTER | ES_NOHIDESEL;
+	if (item.symbolSet() == ZLToolbar::ParameterItem::SET_DIGITS) {
+		textItemStyle |= ES_NUMBER;
+	}
+	SetWindowLong(textItem, GWL_STYLE, textItemStyle);
+
+	addTooltipToWindow(myComboBox, item.tooltip());
+	addTooltipToWindow(getTextItem(myComboBox), item.tooltip());
+
+	myOriginalComboBoxCallback = (WndProc)SetWindowLong(myComboBox, GWL_WNDPROC, (LONG)ComboBoxCallback);
+	SetWindowLong(myComboBox, GWL_USERDATA, (LONG)this);
+
+	HWND textEdit = getTextItem(myComboBox);
+	myOriginalTextEditCallback = (WndProc)SetWindowLong(textEdit, GWL_WNDPROC, (LONG)TextEditCallback);
+	SetWindowLong(textEdit, GWL_USERDATA, (LONG)this);
+}
+
+HWND ZLWin32ApplicationWindow::TextEditParameter::handle() const {
+	return myComboBox;
+}
+
+void ZLWin32ApplicationWindow::TextEditParameter::setValueList(const std::vector<std::string> &values) {
+	std::string oldValue = internalValue();
+
+	if (myParameterItem.type() == ZLToolbar::Item::TEXT_FIELD) {
+		return;
+	}
+
+	SendMessage(myComboBox, CB_RESETCONTENT, 0, 0);
+
+	ZLUnicodeUtil::Ucs2String buffer;
+	for (std::vector<std::string>::const_iterator it = values.begin(); it != values.end(); ++it) {
+		SendMessage(myComboBox, CB_ADDSTRING, 0, (LPARAM)::wchar(::createNTWCHARString(buffer, *it)));
+	}
+
+	if (values.size() > 0) {
+		SendMessage(myComboBox, CB_SETMINVISIBLE, std::min((int)values.size(), 7), 0);
+	}
+
+	internalSetValue(oldValue);
+}
+
+std::string ZLWin32ApplicationWindow::TextEditParameter::internalValue() const {
+	int len = GetWindowTextLengthW(myComboBox);
+	if (len == 0) {
+		return "";
+	}
+	static ZLUnicodeUtil::Ucs2String buffer;
+	buffer.assign(len + 1, '\0');
+	GetWindowTextW(myComboBox, (WCHAR*)::wchar(buffer), len + 1);
+	buffer.pop_back();
+	std::string text;
+	ZLUnicodeUtil::ucs2ToUtf8(text, buffer);
+	return text;
+}
+
+void ZLWin32ApplicationWindow::TextEditParameter::internalSetValue(const std::string &value) {
+	static ZLUnicodeUtil::Ucs2String buffer;
+	::createNTWCHARString(buffer, value);
+	SetWindowTextW(getTextItem(myComboBox), ::wchar(buffer));
+}
+
+void ZLWin32ApplicationWindow::resetFocus() {
+	SetFocus(myMainWindow);
+}
+
+void ZLWin32ApplicationWindow::updateCursor() const {
+	if (myCursor != 0) {
+		SetCursor(myCursor);
+	}
+}
+
+void ZLWin32ApplicationWindow::Toolbar::clear() {
+	hwnd = 0;
+	SeparatorNumbers.clear();
+	ActionCodeById.clear();
+	ParameterCodeById.clear();
+	TBItemByActionCode.clear();
+	for (std::map<HICON,HBITMAP>::const_iterator it = BitmapByIcon.begin(); it != BitmapByIcon.end(); ++it) {
+		DestroyIcon(it->first);
+		DeleteBitmap(it->second);
+	}
+	BitmapByIcon.clear();
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32ApplicationWindow.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,15 +30,15 @@
 #include "../../../../core/src/desktop/application/ZLDesktopApplicationWindow.h"
 
 class ZLWin32ViewWidget;
+class ZLWin32PopupMenu;
 
 class ZLWin32ApplicationWindow : public ZLDesktopApplicationWindow { 
 
 private:
-	static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	static ZLWin32ApplicationWindow *ourApplicationWindow;
+	static const int IconSize;
 
-	static int x(WPARAM lParam);
-	static int y(WPARAM lParam);
+	static LRESULT CALLBACK Callback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+	static ZLWin32ApplicationWindow *ourApplicationWindow;
 
 public:
 	ZLWin32ApplicationWindow(ZLApplication *application);
@@ -46,7 +46,6 @@
 
 private:
 	ZLViewWidget *createViewWidget();
-	void addToolbarItem(ZLApplication::Toolbar::ItemPtr item);
 	void close();
 
 	void grabAllKeys(bool grab);
@@ -59,37 +58,96 @@
 	void setFullscreen(bool fullscreen);
 
 	void init();
+	void refresh();
+	void processAllEvents();
 
-	void setToggleButtonState(const ZLApplication::Toolbar::ButtonItem &button);
-	void setToolbarItemState(ZLApplication::Toolbar::ItemPtr item, bool visible, bool enabled);
+	void createWindowToolbar();
+	void createFloatingToolbar();
+	void destroyFloatingToolbar();
+	void registerFloatingToolbarClass();
+
+	void addToolbarItem(ZLToolbar::ItemPtr item);
+	void setToggleButtonState(const ZLToolbar::ToggleButtonItem &button);
+	void setToolbarItemState(ZLToolbar::ItemPtr item, bool visible, bool enabled);
+
+	void updateParameters();
+	void updateWindowToolbarInfo();
+	void updateFullscreenToolbarSize();
+	void setTooltip(TOOLTIPTEXT &tooltip);
+	void runPopup(const NMTOOLBAR &nmToolbar);
+	void processChevron(const NMREBARCHEVRON &chevron);
 
 public:
 	HWND mainWindow() const;
-	int topOffset() const;
 	void blockMouseEvents(bool block);
+	bool mouseEventsAreBlocked() const;
 	void setWait(bool wait);
+	void resetFocus();
+	void updateCursor() const;
 
 private:
 	LRESULT mainLoopCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 public:
-	void onToolbarButtonPress(int index);
-/*
-	void handleKeyEventSlot(GdkEventKey *event);
-	void handleScrollEventSlot(GdkEventScroll *event);
-*/
+	void onToolbarButtonRelease(int index);
+
+private:
+	class TextEditParameter : public VisualParameter {
+
+	private:
+		typedef LRESULT(CALLBACK *WndProc)(HWND, UINT, WPARAM, LPARAM);
+		static LRESULT CALLBACK ComboBoxCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+		static LRESULT CALLBACK TextEditCallback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+	public:
+		TextEditParameter(ZLApplication &application, HWND mainWindow, HWND toolbar, int idCommand, const ZLToolbar::ParameterItem &item);
+		HWND handle() const;
+
+	private:
+		std::string internalValue() const;
+		void internalSetValue(const std::string &value);
+		void setValueList(const std::vector<std::string> &values);
+
+	private:
+		ZLApplication &myApplication;
+		HWND myMainWindow;
+		HWND myComboBox;
+		WndProc myOriginalComboBoxCallback;
+		WndProc myOriginalTextEditCallback;
+		const ZLToolbar::ParameterItem &myParameterItem;
+	};
 
 private:
 	ZLUnicodeUtil::Ucs2String myClassName;
 
+	struct Toolbar {
+		Toolbar() : hwnd(0) {
+		}
+		void clear();
+
+		HWND hwnd;
+		std::map<ZLToolbar::ItemPtr,int> SeparatorNumbers;
+		std::map<std::string,int> ActionCodeById;
+		std::map<std::string,int> ParameterCodeById;
+		std::map<int,ZLToolbar::ItemPtr> TBItemByActionCode;
+		std::map<HICON,HBITMAP> BitmapByIcon;
+	};
+
 	HWND myMainWindow;
-	HWND myToolbar;
+	HWND myRebar;
+	Toolbar myWindowToolbar;
+	HWND myDockWindow;
+	Toolbar myFullscreenToolbar;
+	bool myFloatingToolbarClassRegistered;
+	Toolbar &toolbar(ToolbarType type) {
+		return (type == WINDOW_TOOLBAR) ? myWindowToolbar : myFullscreenToolbar;
+	}
+	REBARBANDINFO myToolbarInfo;
+	std::vector<ZLToolbar::ItemPtr> myFloatingToolbarItems;
 
-	ZLWin32ViewWidget *myWin32ViewWidget;
+	std::map<int,HWND> myParameters;
 
-	std::map<int,ZLApplication::Toolbar::ItemPtr> myButtonByActionCode;
-	std::map<ZLApplication::Toolbar::ItemPtr,int> mySeparatorNumbers;
-	std::map<std::string,int> myActionCodeById;
+	ZLWin32ViewWidget *myWin32ViewWidget;
 
 	bool myBlockMouseEvents;
 	int myKeyboardModifierMask;
@@ -99,6 +157,8 @@
 
 	HCURSOR myCursor;
 
+	shared_ptr<ZLWin32PopupMenu> myPopupMenu;
+
 friend class ZLWin32TimeManager;
 };
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.cpp	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "ZLWin32PopupMenu.h"
+
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
+
+int ZLWin32PopupMenu::ourFontSize;
+
+HFONT ZLWin32PopupMenu::menuFont() {
+	static HFONT font = 0;
+	if (font == 0) {
+		NONCLIENTMETRICS metrics;
+		ZeroMemory(&metrics, sizeof(metrics));
+		metrics.cbSize = sizeof(metrics);
+		SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(metrics), &metrics, 0);
+		ourFontSize = metrics.lfMenuFont.lfHeight * (-3) / 2;
+		metrics.lfMenuFont.lfHeight = ourFontSize;
+		metrics.lfMenuFont.lfQuality = 5;
+		/*
+		LOGFONT logicalFont;
+		ZeroMemory(&logicalFont, sizeof(logicalFont));
+		logicalFont.lfHeight = ourFontSize;
+		logicalFont.lfWeight = FW_REGULAR;
+		logicalFont.lfItalic = false;
+		logicalFont.lfQuality = 5;
+		font = CreateFontIndirect(&logicalFont);
+		*/
+		font = CreateFontIndirect(&metrics.lfMenuFont);
+	}
+	return font;
+}
+
+ZLWin32PopupMenu::ZLWin32PopupMenu(HWND mainWindow) : myMainWindow(mainWindow) {
+	myHMenu = CreatePopupMenu();
+	myItemCount = 0;
+	myShowIcons = false;
+}
+
+ZLWin32PopupMenu::~ZLWin32PopupMenu() {
+	DestroyMenu(myHMenu);
+}
+
+int ZLWin32PopupMenu::run(POINT pt, bool right) {
+	int num = TrackPopupMenu(
+		myHMenu,
+		(right ? TPM_RIGHTALIGN : TPM_LEFTALIGN) | TPM_TOPALIGN | TPM_RETURNCMD,
+		pt.x, pt.y, 0, myMainWindow, 0
+	);
+	PostMessage(myMainWindow, WM_NULL, 0, 0);
+	return (num > 0) ? myCodes[num - 1] : -1;
+}
+
+void ZLWin32PopupMenu::measureItem(MEASUREITEMSTRUCT &mi) {
+	HDC dc = ::GetDC(myMainWindow);
+	HFONT font = menuFont();
+	HFONT oldFont = (HFONT)SelectObject(dc, font);
+	if (oldFont != font) {
+		DeleteObject(oldFont);
+	}
+	SIZE size;
+	const int index = mi.itemID - 1;
+	GetTextExtentPointW(dc, textData(index), textSize(index), &size);
+	mi.itemWidth = size.cx + 20;
+	if (myShowIcons) {
+		mi.itemWidth += 42;
+	}
+	::ReleaseDC(myMainWindow, dc);
+	mi.itemHeight = ourFontSize * 4 / 3;
+	if (myShowIcons && (mi.itemHeight < 36)) {
+		mi.itemHeight = 36;
+	}
+}
+
+void ZLWin32PopupMenu::drawItem(DRAWITEMSTRUCT &di) {
+	HFONT font = menuFont();
+	HFONT oldFont = (HFONT)SelectObject(di.hDC, font);
+	if (oldFont != font) {
+		DeleteObject(oldFont);
+	}
+
+	if (di.itemState & ODS_DISABLED) {
+		static COLORREF whiteColor = GetSysColor(COLOR_MENU);
+		static HBRUSH whiteBrush = CreateSolidBrush(whiteColor);
+		if (whiteColor != GetSysColor(COLOR_MENU)) {
+			whiteColor = GetSysColor(COLOR_MENU);
+			whiteBrush = CreateSolidBrush(whiteColor);
+		}
+		FillRect(di.hDC, &di.rcItem, whiteBrush);
+		SetTextColor(di.hDC, GetSysColor(COLOR_GRAYTEXT));
+	} else if (di.itemState & ODS_SELECTED) {
+		static COLORREF blueColor = GetSysColor(COLOR_HIGHLIGHT);
+		static HBRUSH blueBrush = CreateSolidBrush(blueColor);
+		if (blueColor != GetSysColor(COLOR_HIGHLIGHT)) {
+			blueColor = GetSysColor(COLOR_HIGHLIGHT);
+			blueBrush = CreateSolidBrush(blueColor);
+		}
+		FillRect(di.hDC, &di.rcItem, blueBrush);
+		SetTextColor(di.hDC, GetSysColor(COLOR_HIGHLIGHTTEXT));
+	} else {
+		static COLORREF whiteColor = GetSysColor(COLOR_MENU);
+		static HBRUSH whiteBrush = CreateSolidBrush(whiteColor);
+		if (whiteColor != GetSysColor(COLOR_MENU)) {
+			whiteColor = GetSysColor(COLOR_MENU);
+			whiteBrush = CreateSolidBrush(whiteColor);
+		}
+		FillRect(di.hDC, &di.rcItem, whiteBrush);
+		SetTextColor(di.hDC, GetSysColor(COLOR_MENUTEXT));
+	}
+	SetBkMode(di.hDC, TRANSPARENT);
+	const int index = di.itemID - 1;
+	int itemHeight = ourFontSize * 4 / 3;
+	if (myShowIcons && (itemHeight < 36)) {
+		itemHeight = 36;
+	}
+	HICON icon = myIcons[index];
+	if (icon != 0) {
+		DrawIcon(di.hDC, di.rcItem.left + 10, di.rcItem.top + (itemHeight - 32) / 2, icon);
+	}
+	const int left = myShowIcons ? di.rcItem.left + 52 : di.rcItem.left + 10;
+	TextOutW(di.hDC, left, di.rcItem.top + (itemHeight - ourFontSize) / 2, textData(index), textSize(index));
+}
+
+void ZLWin32PopupMenu::addItem(const std::string &str, HICON icon, bool active, int id) {
+	MENUITEMINFO miInfo;
+	miInfo.cbSize = sizeof(MENUITEMINFO);
+	miInfo.fMask = MIIM_STATE | MIIM_ID | MIIM_FTYPE;
+	miInfo.fType = MFT_OWNERDRAW;
+	miInfo.fState = active ? MFS_ENABLED : MFS_DISABLED;
+	miInfo.wID = myItemCount + 1;
+	InsertMenuItem(myHMenu, myItemCount++, true, &miInfo);
+	myStrings.push_back(ZLUnicodeUtil::Ucs2String());
+	myIcons.push_back(icon);
+	if (icon != 0) {
+		myShowIcons = true;
+	}
+	::createNTWCHARString(myStrings.back(), str);
+	myCodes.push_back((id != -1) ? id : myItemCount);
+}
+
+void ZLWin32PopupMenu::addSeparator() {
+	if (myItemCount > 0) {
+		MENUITEMINFO miInfo;
+		miInfo.cbSize = sizeof(MENUITEMINFO);
+		miInfo.fMask = MIIM_FTYPE;
+		miInfo.fType = MFT_SEPARATOR;
+		myStrings.push_back(ZLUnicodeUtil::Ucs2String());
+		myIcons.push_back(0);
+		InsertMenuItem(myHMenu, myItemCount++, true, &miInfo);
+		myCodes.push_back(-1);
+	}
+}
+
+WCHAR *ZLWin32PopupMenu::textData(int index) {
+	return (WCHAR*)::wchar(myStrings[index]);
+}
+
+size_t ZLWin32PopupMenu::textSize(int index) {
+	return myStrings[index].size() - 1;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.h	1970-01-01 01:00:00.000000000 +0100
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/application/ZLWin32PopupMenu.h	2009-04-30 22:26:45.000000000 +0100
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __ZLWIN32POPUPMENU_H__
+#define __ZLWIN32POPUPMENU_H__
+
+#include <vector>
+#include <string>
+
+#include <windows.h>
+
+#include <ZLUnicodeUtil.h>
+
+class ZLWin32PopupMenu {
+
+private:
+	static HFONT menuFont();
+	static int ourFontSize;
+
+public:
+	ZLWin32PopupMenu(HWND mainWindow);
+	~ZLWin32PopupMenu();
+
+	int run(POINT pt, bool right = false);
+
+	void measureItem(MEASUREITEMSTRUCT &mi);
+	void drawItem(DRAWITEMSTRUCT &di);
+
+	void addSeparator();
+	void addItem(const std::string &str, HICON icon, bool active, int id = -1);
+
+private:
+	WCHAR *textData(int index);
+	size_t textSize(int index);
+	
+private:
+	HWND myMainWindow;
+	HMENU myHMenu;
+	std::vector<ZLUnicodeUtil::Ucs2String> myStrings;
+	std::vector<HICON> myIcons;
+	std::vector<int> myCodes;
+	bool myShowIcons;
+	int myItemCount;
+};
+
+#endif /* __ZLWIN32POPUPMENU_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogContent.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32Dialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #include "ZLWin32DialogManager.h"
 #include "ZLWin32Dialog.h"
 #include "../application/ZLWin32ApplicationWindow.h"
+#include "../image/ZLWin32ImageManager.h"
 #include "ZLWin32OptionsDialog.h"
 #include "ZLWin32SelectionDialog.h"
 #include "ZLWin32MessageBox.h"
@@ -40,8 +41,8 @@
 	return new ZLWin32OptionsDialog(*myApplicationWindow, resource()[key], applyAction, showApplyButton);
 }
 
-void ZLWin32DialogManager::informationBox(const ZLResourceKey &key, const std::string &message) const {
-	ZLWin32MessageBox box(*myApplicationWindow, W32StandardIcon::ID_INFORMATION, dialogTitle(key), message);
+void ZLWin32DialogManager::informationBox(const std::string &title, const std::string &message) const {
+	ZLWin32MessageBox box(*myApplicationWindow, W32StandardIcon::ID_INFORMATION, title, message);
 	box.addButton(buttonName(OK_BUTTON));
 	box.run();
 }
@@ -99,3 +100,39 @@
 		}
 	}
 }
+
+void ZLWin32DialogManager::setClipboardImage(const ZLImageData &image, ClipboardType type) const {
+	if (type == CLIPBOARD_MAIN) {
+		ZLWin32ImageData &win32Image = (ZLWin32ImageData&)image;
+		const BYTE *pixels = win32Image.pixels(ZLColor(255, 255, 255));
+		if (pixels != 0) {
+			if (OpenClipboard(myApplicationWindow->mainWindow())) {
+				EmptyClipboard();
+				HDC dc = GetDC(myApplicationWindow->mainWindow());
+				BITMAPINFOHEADER header;
+				ZeroMemory(&header, sizeof(header));
+				header.biSize = sizeof(header);
+				header.biWidth = image.width();
+				header.biHeight = image.height();
+				header.biPlanes = 1;
+				header.biBitCount = 24;
+				header.biCompression = BI_RGB;
+				header.biSizeImage = 0;
+				HBITMAP bitmap = CreateDIBitmap(
+					dc, &header,
+					CBM_INIT,
+					pixels, win32Image.info(),
+					DIB_RGB_COLORS
+				);
+					/*
+					x, y - height, width, height,
+					0, 0, width, height,
+					pixels, win32Image.info(), DIB_RGB_COLORS, SRCCOPY);
+					*/
+				SetClipboardData(CF_BITMAP, bitmap);
+				ReleaseDC(myApplicationWindow->mainWindow(), dc);
+				CloseClipboard();
+			}
+		}
+	}
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32DialogManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@
 
 	shared_ptr<ZLDialog> createDialog(const ZLResourceKey &key) const;
 	shared_ptr<ZLOptionsDialog> createOptionsDialog(const ZLResourceKey &id, shared_ptr<ZLRunnable> applyAction, bool showApplyButton) const;
-	void informationBox(const ZLResourceKey &key, const std::string &message) const;
+	void informationBox(const std::string &title, const std::string &message) const;
 	void errorBox(const ZLResourceKey &key, const std::string &message) const;
 	int questionBox(const ZLResourceKey &key, const std::string &message, const ZLResourceKey &button0, const ZLResourceKey &button1, const ZLResourceKey &button2) const;
 	bool selectionDialog(const ZLResourceKey &key, ZLTreeHandler &handler) const;
@@ -47,6 +47,7 @@
 
 	bool isClipboardSupported(ClipboardType type) const;
 	void setClipboardText(const std::string &text, ClipboardType type) const;
+	void setClipboardImage(const ZLImageData &imageData, ClipboardType type) const;
 
 	//void grabKeyboard(bool grab) { myIsKeyboardGrabbed = grab; }
 	//bool isKeyboardGrabbed() const { return myIsKeyboardGrabbed; }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32MessageBox.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionsDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -180,17 +180,7 @@
 			o.onValueEdited(myComboBox->text());
 		}
 	} else if (event == W32ComboBox::SELECTION_CHANGED_EVENT) {
-		const std::string text = myComboBox->text();
-		size_t index;
-		const std::vector<std::string> &values = o.values();
-		for (index = 0; index < values.size(); ++index) {
-			if (values[index] == text) {
-				break;
-			}
-		}
-		if (index < values.size()) {
-  		o.onValueSelected(index);
-		}
+		o.onStringValueSelected(myComboBox->text());
 	}
 }
 
@@ -302,8 +292,8 @@
 			refs[i] = RGB(color.Red, color.Green, color.Blue);
 		}
 		chooser.lStructSize = sizeof(chooser);
-		chooser.hwndOwner = 0; // TODO: !!!
-		//chooser.hInstance = 0;
+		chooser.hwndOwner = GetActiveWindow();
+		chooser.hInstance = 0;
 		ZLColor currentColor = myStandardColorComboBox->selectedColor();
 		chooser.rgbResult = RGB(currentColor.Red, currentColor.Green, currentColor.Blue);
 		chooser.lpCustColors = refs;
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32OptionView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@
 #include "../w32widgets/W32Control.h"
 
 #include "../application/ZLWin32ApplicationWindow.h"
+#include "../../../../core/src/win32/util/W32WCHARUtil.h"
 
 const int ICON_SIZE = 22;
 
@@ -79,7 +80,8 @@
 	if (it == myIcons.end()) {
 		std::string imageFileName = ZLibrary::ApplicationImageDirectory() + ZLibrary::FileNameDelimiter + pixmapName + ".ico";
 		ZLFile file(imageFileName);
-		HICON icon = (HICON)LoadImageA(0, file.path().c_str(), IMAGE_ICON, ICON_SIZE, ICON_SIZE, LR_LOADFROMFILE);
+		ZLUnicodeUtil::Ucs2String wPath;
+		HICON icon = (HICON)LoadImageW(0, ::wchar(::createNTWCHARString(wPath, file.path())), IMAGE_ICON, ICON_SIZE, ICON_SIZE, LR_LOADFROMFILE);
 		myIcons[pixmapName] = icon;
 		return icon;
 	} else {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/dialogs/ZLWin32SelectionDialog.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_bmp.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_bmp.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_bmp.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_bmp.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_gif.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_gif.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_gif.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_gif.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_jpeg.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_jpeg.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_jpeg.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_jpeg.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_png.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_png.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_png.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_png.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_tiff.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_tiff.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/image/ZLWin32ImageManager_tiff.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/image/ZLWin32ImageManager_tiff.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/library/ZLibrary.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/library/ZLibrary.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/library/ZLibrary.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/library/ZLibrary.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 #include <ZLApplication.h>
 #include <ZLibrary.h>
+#include <ZUnicodeUtil.h>
 
 #include "../../../../core/src/win32/filesystem/ZLWin32FSManager.h"
 #include "../time/ZLWin32Time.h"
@@ -36,6 +37,25 @@
 const std::string ZLibrary::EndOfLine("\r\n");
 
 bool ZLibrary::init(int &argc, char **&argv) {
+	WCHAR **wArgv = CommandLineToArgvW(GetCommandLineW(), &argc);
+	static std::string arguments;
+	std::vector<int> offsets;
+	offsets.push_back(0);
+	for (int i = 0; i < argc; ++i) {
+		ZLUnicodeUtil::Ucs2String wArg;
+		for (int j = 0; wArgv[i][j] != 0; ++j) {
+			wArg.push_back(wArgv[i][j]);
+		}
+		std::string arg;
+		ZLUnicodeUtil::ucs2ToUtf8(arg, wArg);
+		arguments += arg + '\0';
+		offsets.push_back(arguments.length());
+	}
+	argv = new char*[argc];
+	for (int i = 0; i < argc; ++i) {
+		argv[i] = (char*)arguments.data() + offsets[i];
+	}
+
 	parseArguments(argc, argv);
 
 	ZLWin32ConfigManager::createInstance();
@@ -65,172 +85,261 @@
 	delete application;
 }
 
-std::string ZLibrary::Language() {
-	if (!ourLanguage.empty()) {
-		return ourLanguage;
-	}
-
+void ZLibrary::initLocale() {
 	LANGID id = GetUserDefaultUILanguage();
-	switch (id & 0xFF) {
+	LCID lcid = GetUserDefaultLCID();
+	switch (PRIMARYLANGID(id)) {
 		case LANG_ARABIC:
-			return "ar";
+			ourLanguage = "ar";
+			break;
 		case LANG_BULGARIAN:
-			return "bg";
+			ourLanguage = "bg";
+			break;
 		case LANG_CATALAN:
-			return "ca";
+			ourLanguage = "ca";
+			break;
 		case LANG_CHINESE:
-			return "zh";
+			ourLanguage = "zh";
+			break;
 		case LANG_CZECH:
-			return "cs";
+			ourLanguage = "cs";
+			break;
 		case LANG_DANISH:
-			return "da";
+			ourLanguage = "da";
+			break;
 		case LANG_GERMAN:
-			return "de";
+			ourLanguage = "de";
+			break;
 		case LANG_GREEK:
-			return "el";
+			ourLanguage = "el";
+			break;
 		case LANG_ENGLISH:
-			return "en";
+			ourLanguage = "en";
+			break;
 		case LANG_SPANISH:
-			return "es";
+			ourLanguage = "es";
+			switch (lcid) {
+				case 0x040A:
+				case 0x0C0A:
+					ourCountry = "ES";
+					break;
+				default:
+					ourCountry = "LA";
+					break;
+			}
+			break;
 		case LANG_FINNISH:
-			return "fi";
+			ourLanguage = "fi";
+			break;
 		case LANG_FRENCH:
-			return "fr";
+			ourLanguage = "fr";
+			break;
 		case LANG_HEBREW:
-			return "he";
+			ourLanguage = "he";
+			break;
 		case LANG_HUNGARIAN:
-			return "hu";
+			ourLanguage = "hu";
+			break;
 		case LANG_ICELANDIC:
-			return "is";
+			ourLanguage = "is";
+			break;
 		case LANG_ITALIAN:
-			return "it";
+			ourLanguage = "it";
+			break;
 		case LANG_JAPANESE:
-			return "ja";
+			ourLanguage = "ja";
+			break;
 		case LANG_KOREAN:
-			return "ko";
+			ourLanguage = "ko";
+			break;
 		case LANG_DUTCH:
-			return "nl";
+			ourLanguage = "nl";
+			break;
 		case LANG_NORWEGIAN:
-			return "no";
+			ourLanguage = "no";
+			break;
 		case LANG_POLISH:
-			return "pl";
+			ourLanguage = "pl";
+			break;
 		case LANG_PORTUGUESE:
-			return "pt";
+			ourLanguage = "pt";
+			switch (SUBLANGID(id)) {
+				case SUBLANG_PORTUGUESE_BRAZILIAN:
+					ourCountry = "BR";
+					break;
+				default:
+					ourCountry = "PT";
+					break;
+			}
+			break;
 		case LANG_ROMANIAN:
-			return "ro";
+			ourLanguage = "ro";
+			break;
 		case LANG_RUSSIAN:
-			return "ru";
+			ourLanguage = "ru";
+			break;
 		case LANG_SERBIAN:
-			switch ((id >> 16) & 0xFF) {
+			switch (SUBLANGID(id)) {
 				case 0x04:
 				case 0x10:
-					return "hr";
+					ourLanguage = "hr";
+					break;
 				case 0x14:
 				case 0x20:
 				case 0x78:
-					return "bs";
+					ourLanguage = "bs";
+					break;
 				default:
-					return "sr";
+					ourLanguage = "sr";
+					break;
 			}
+			break;
 		case LANG_SLOVAK:
-			return "sk";
+			ourLanguage = "sk";
+			break;
 		case LANG_ALBANIAN:
-			return "sq";
+			ourLanguage = "sq";
+			break;
 		case LANG_SWEDISH:
-			return "sv";
+			ourLanguage = "sv";
+			break;
 		case LANG_THAI:
-			return "th";
+			ourLanguage = "th";
+			break;
 		case LANG_TURKISH:
-			return "tr";
+			ourLanguage = "tr";
+			break;
 		case LANG_URDU:
-			return "ur";
+			ourLanguage = "ur";
+			break;
 		case LANG_INDONESIAN:
-			return "id";
+			ourLanguage = "id";
+			break;
 		case LANG_UKRAINIAN:
-			return "uk";
+			ourLanguage = "uk";
+			break;
 		case LANG_BELARUSIAN:
-			return "be";
+			ourLanguage = "be";
+			break;
 		case LANG_SLOVENIAN:
-			return "sl";
+			ourLanguage = "sl";
+			break;
 		case LANG_ESTONIAN:
-			return "et";
+			ourLanguage = "et";
+			break;
 		case LANG_LATVIAN:
-			return "lv";
+			ourLanguage = "lv";
+			break;
 		case LANG_LITHUANIAN:
-			return "lt";
+			ourLanguage = "lt";
+			break;
 		case LANG_FARSI:
-			return "fa";
+			ourLanguage = "fa";
+			break;
 		case LANG_VIETNAMESE:
-			return "vi";
+			ourLanguage = "vi";
+			break;
 		case LANG_ARMENIAN:
-			return "hy";
+			ourLanguage = "hy";
+			break;
 		case LANG_AZERI:
-			return "az";
+			ourLanguage = "az";
+			break;
 		case LANG_BASQUE:
-			return "eu";
+			ourLanguage = "eu";
+			break;
 		case LANG_MACEDONIAN:
-			return "mk";
+			ourLanguage = "mk";
+			break;
 		case LANG_AFRIKAANS:
-			return "af";
+			ourLanguage = "af";
+			break;
 		case LANG_GEORGIAN:
-			return "ka";
+			ourLanguage = "ka";
+			break;
 		case LANG_FAEROESE:
-			return "fo";
+			ourLanguage = "fo";
+			break;
 		case LANG_HINDI:
-			return "hi";
+			ourLanguage = "hi";
+			break;
 		case LANG_MALAY:
-			return "ms";
+			ourLanguage = "ms";
+			break;
 		case LANG_KAZAK:
-			return "kk";
+			ourLanguage = "kk";
+			break;
 		case LANG_KYRGYZ:
-			return "ky";
+			ourLanguage = "ky";
+			break;
 		case LANG_SWAHILI:
-			return "sw";
+			ourLanguage = "sw";
+			break;
 		case LANG_UZBEK:
-			return "uz";
+			ourLanguage = "uz";
+			break;
 		case LANG_TATAR:
-			return "tt";
+			ourLanguage = "tt";
+			break;
 		case LANG_BENGALI:
-			return "bn";
+			ourLanguage = "bn";
+			break;
 		case LANG_PUNJABI:
-			return "pa";
+			ourLanguage = "pa";
+			break;
 		case LANG_GUJARATI:
-			return "gu";
+			ourLanguage = "gu";
+			break;
 		case LANG_ORIYA:
-			return "or";
+			ourLanguage = "or";
+			break;
 		case LANG_TAMIL:
-			return "ta";
+			ourLanguage = "ta";
+			break;
 		case LANG_TELUGU:
-			return "te";
+			ourLanguage = "te";
+			break;
 		case LANG_KANNADA:
-			return "kn";
+			ourLanguage = "kn";
+			break;
 		case LANG_MALAYALAM:
-			return "ml";
+			ourLanguage = "ml";
+			break;
 		case LANG_ASSAMESE:
-			return "as";
+			ourLanguage = "as";
+			break;
 		case LANG_MARATHI:
-			return "mr";
+			ourLanguage = "mr";
+			break;
 		case LANG_SANSKRIT:
-			return "sa";
+			ourLanguage = "sa";
+			break;
 		case LANG_MONGOLIAN:
-			return "mn";
+			ourLanguage = "mn";
+			break;
 		case LANG_GALICIAN:
-			return "gl";
+			ourLanguage = "gl";
+			break;
 		case LANG_KONKANI:
-			return "kok";
+			ourLanguage = "kok";
+			break;
 		//case LANG_MANIPURI:
-			//return "";
+			//ourLanguage = "";
 		//case LANG_SINDHI:
-			//return "";
+			//ourLanguage = "";
 		case LANG_SYRIAC:
-			return "syr";
+			ourLanguage = "syr";
+			break;
 		//case LANG_KASHMIRI:
-			//return "";
+			//ourLanguage = "";
 		case LANG_NEPALI:
-			return "ne";
+			ourLanguage = "ne";
+			break;
 		case LANG_DIVEHI:
-			return "dv";
+			ourLanguage = "dv";
+			break;
 		default:
-			return "en";
+			ourLanguage = "en";
+			break;
 	}
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/message/ZLWin32Message.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/message/ZLWin32Message.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/message/ZLWin32Message.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/message/ZLWin32Message.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/message/ZLWin32Message.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/message/ZLWin32Message.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/message/ZLWin32Message.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/message/ZLWin32Message.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2004-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/time/ZLWin32Time.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/time/ZLWin32Time.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/time/ZLWin32Time.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/time/ZLWin32Time.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/time/ZLWin32Time.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/time/ZLWin32Time.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/time/ZLWin32Time.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/time/ZLWin32Time.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32PaintContext.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -96,6 +96,9 @@
 }
 
 void ZLWin32PaintContext::setFont(const std::string &family, int size, bool bold, bool italic) {
+	if (size < 4) {
+		size = 4;
+	}
 	if (myDisplayContext == 0) {
 		return;
 	}
@@ -146,10 +149,11 @@
 			CreateHatchBrush(HS_DIAGCROSS, colorref);
 }
 
-int ZLWin32PaintContext::stringWidth(const char *str, int len) const {
+int ZLWin32PaintContext::stringWidth(const char *str, int len, bool rtl) const {
 	if (myDisplayContext == 0) {
 		return 0;
 	}
+	SetTextAlign(myDisplayContext, rtl ? TA_RTLREADING : 0);
 	SIZE size;
 	int utf8len = ZLUnicodeUtil::utf8Length(str, len);
 	if (utf8len == len) {
@@ -178,13 +182,17 @@
 	return myTextMetric.tmDescent;
 }
 
-void ZLWin32PaintContext::drawString(int x, int y, const char *str, int len) {
+void ZLWin32PaintContext::drawString(int x, int y, const char *str, int len, bool rtl) {
 	if (myDisplayContext == 0) {
 		return;
 	}
 	y -= stringHeight();
 	y += myTextMetric.tmDescent;
+	if (rtl) {
+		x -= 1;
+	}
 	int utf8len = ZLUnicodeUtil::utf8Length(str, len);
+	SetTextAlign(myDisplayContext, rtl ? TA_RTLREADING : 0);
 	if (utf8len == len) {
 		TextOutA(myDisplayContext, x, y, str, len);
 	} else {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32PaintContext.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32PaintContext.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32PaintContext.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32PaintContext.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,11 +44,11 @@
 	void setColor(ZLColor color, LineStyle style = SOLID_LINE);
 	void setFillColor(ZLColor color, FillStyle style = SOLID_FILL);
 
-	int stringWidth(const char *str, int len) const;
+	int stringWidth(const char *str, int len, bool rtl) const;
 	int spaceWidth() const;
 	int stringHeight() const;
 	int descent() const;
-	void drawString(int x, int y, const char *str, int len);
+	void drawString(int x, int y, const char *str, int len, bool rtl);
 
 	void drawImage(int x, int y, const ZLImageData &image);
 
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,117 @@
  * 02110-1301, USA.
  */
 
+#include <algorithm>
+
 #include "ZLWin32ViewWidget.h"
 #include "ZLWin32PaintContext.h"
 
-ZLWin32ViewWidget::ZLWin32ViewWidget(ZLWin32ApplicationWindow &window) : ZLViewWidget((ZLViewWidget::Angle)window.application().AngleStateOption.value()), myWindow(window), myMouseCaptured(false), myRotator(0) {
+static ZLWin32ViewWidget *viewWidgetInstance = 0;
+
+LRESULT CALLBACK ZLWin32ViewWidget::ViewWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	return viewWidgetInstance->Callback(hWnd, uMsg, wParam, lParam);
+}
+
+LRESULT ZLWin32ViewWidget::Callback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
+	WndProc orig = myOriginalCallback;
+
+	switch (uMsg) {
+		case WM_RBUTTONDOWN:
+		case WM_RBUTTONUP:
+			return 0;
+		case WM_LBUTTONDOWN:
+			if (!myWindow.mouseEventsAreBlocked()) {
+				myWindow.resetFocus();
+				if (myMouseCaptured) {
+					SetCapture(myHandle);
+				}
+				onMousePress(LOWORD(lParam), HIWORD(lParam));
+			}
+			return 0;
+		case WM_LBUTTONUP:
+			if (!myWindow.mouseEventsAreBlocked()) {
+				onMouseRelease(LOWORD(lParam), HIWORD(lParam));
+			}
+			if (myHandle == GetCapture()) {
+				ReleaseCapture();
+			}
+			return 0;
+		case WM_MOUSEMOVE:
+			if (!myWindow.mouseEventsAreBlocked()) {
+				if (wParam & MK_LBUTTON) {
+					onMouseMovePressed(LOWORD(lParam), HIWORD(lParam));
+				} else {
+					onMouseMove(LOWORD(lParam), HIWORD(lParam));
+				}
+			}
+			myWindow.updateCursor();
+			return 0;
+		case WM_ERASEBKGND:
+			return 0;
+		case WM_PAINT:
+			doPaint();
+			return 0;
+		case WM_HSCROLL:
+		case WM_VSCROLL:
+		{
+			const int dir = (uMsg == WM_VSCROLL) ? SB_VERT : SB_HORZ;
+			const size_t extra = 
+				(uMsg == WM_VSCROLL) ? myVScrollBarExtra : myHScrollBarExtra;
+			SCROLLINFO info;
+			info.cbSize = sizeof(SCROLLINFO);
+			info.fMask = SIF_ALL;
+			GetScrollInfo(myHandle, dir, &info);
+			ZLView::Direction direction =
+				(uMsg == WM_VSCROLL) ? ZLView::VERTICAL : ZLView::HORIZONTAL;
+			switch (LOWORD(wParam)) {
+				case SB_TOP:
+					onScrollbarPageStep(direction, -1);
+					break;
+				case SB_BOTTOM:
+					onScrollbarPageStep(direction, 1);
+					break;
+				case SB_LINEUP:
+					onScrollbarStep(direction, -1);
+					break;
+				case SB_LINEDOWN:
+					onScrollbarStep(direction, 1);
+					break;
+				case SB_PAGEUP:
+					onScrollbarPageStep(direction, -1);
+					break;
+				case SB_PAGEDOWN:
+					onScrollbarPageStep(direction, 1);
+					break;
+				case SB_THUMBTRACK:
+					info.nPos = info.nTrackPos;
+					info.fMask = SIF_POS;
+					SetScrollInfo(myHandle, dir, &info, true);
+					info.fMask = SIF_ALL;
+					GetScrollInfo(myHandle, dir, &info);
+					onScrollbarMoved(
+						direction,
+						info.nMax - info.nMin - extra,
+						info.nPos,
+						info.nPos + info.nPage - extra
+					);
+					break;
+			}
+			SendMessage(hWnd, WM_PAINT, 0, 0);
+			return orig(hWnd, uMsg, wParam, lParam);
+		}
+		case WM_CAPTURECHANGED:
+			repaint();
+			return orig(hWnd, uMsg, wParam, lParam);
+		default:
+			return orig(hWnd, uMsg, wParam, lParam);
+	}
+}
+
+ZLWin32ViewWidget::ZLWin32ViewWidget(ZLWin32ApplicationWindow &window) : ZLViewWidget((ZLView::Angle)window.application().AngleStateOption.value()), myWindow(window), myMouseCaptured(false), myRotator(0), myHScrollBarIsEnabled(false), myVScrollBarIsEnabled(false) {
+	viewWidgetInstance = this;
+	myHandle = CreateWindow(WC_EDIT, 0, (WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_HSCROLL) & ~WS_BORDER, 0, 0, 0, 0, myWindow.mainWindow(), 0, GetModuleHandle(0), 0);
+	myOriginalCallback = (WndProc)SetWindowLong(myHandle, GWL_WNDPROC, (LONG)ViewWndProc);
+	ShowScrollBar(myHandle, SB_BOTH, false);
 }
 
 void ZLWin32ViewWidget::trackStylus(bool track) {
@@ -29,9 +136,8 @@
 
 void ZLWin32ViewWidget::repaint()	{
 	RECT rectangle;
-	GetClientRect(myWindow.mainWindow(), &rectangle);
-	rectangle.top += myWindow.topOffset();
-	InvalidateRect(myWindow.mainWindow(), &rectangle, false);
+	GetClientRect(myHandle, &rectangle);
+	InvalidateRect(myHandle, &rectangle, false);
 }
 
 ZLWin32ViewWidget::Rotator::Rotator(int width, int height) : myWidth(width), myHeight(height), mySign(-1) {
@@ -84,7 +190,7 @@
 	}
 }
 
-void ZLWin32ViewWidget::Rotator::draw(HDC dc, int topOffset) {
+void ZLWin32ViewWidget::Rotator::draw(HDC dc) {
 	BITMAPINFO bi;
 	bi.bmiHeader.biSize = sizeof(bi.bmiHeader);
   bi.bmiHeader.biWidth = myWidth;
@@ -95,44 +201,41 @@
   bi.bmiHeader.biSizeImage = 4 * myWidth * myHeight;
   bi.bmiHeader.biClrUsed = 0;
   bi.bmiHeader.biClrImportant = 0;
-	int offset = (mySign == 1) ? topOffset : topOffset - 1;
-	SetDIBitsToDevice(dc, 0, offset, myWidth, myHeight, 0, 0, 0, myHeight, myBuffer1, &bi, DIB_RGB_COLORS);
+	SetDIBitsToDevice(dc, 0, 0, myWidth, myHeight, 0, 0, 0, myHeight, myBuffer1, &bi, DIB_RGB_COLORS);
 }
 
 void ZLWin32ViewWidget::doPaint()	{
 	ZLWin32PaintContext &win32Context = (ZLWin32PaintContext&)view()->context();
-	HWND window = myWindow.mainWindow();
-	int offset = myWindow.topOffset();
 
 	RECT rectangle;
-	GetClientRect(window, &rectangle);
+	GetClientRect(myHandle, &rectangle);
 	const int width = rectangle.right - rectangle.left;
-	const int height = rectangle.bottom - rectangle.top - offset;
+	const int height = rectangle.bottom - rectangle.top;
 
 	switch (rotation()) {
-		case DEGREES0:
-		case DEGREES180:
-			win32Context.updateInfo(window, width, height);
-			break;
-		case DEGREES90:
-		case DEGREES270:
-			win32Context.updateInfo(window, height, width);
+		case ZLView::DEGREES0:
+		case ZLView::DEGREES180:
+			win32Context.updateInfo(myHandle, width, height);
+			break;
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
+			win32Context.updateInfo(myHandle, height, width);
 			break;
 	}
 	view()->paint();
 
 	PAINTSTRUCT paintStructure;
-	HDC dc = BeginPaint(window, &paintStructure);
+	HDC dc = BeginPaint(myHandle, &paintStructure);
 	switch (rotation()) {
-		case DEGREES0:
+		case ZLView::DEGREES0:
 			if (myRotator != 0) {
 				delete myRotator;
 				myRotator = 0;
 			}
 			SetMapMode(dc, MM_TEXT);
-			BitBlt(dc, 0, offset, width + 1, height + 1, win32Context.displayContext(), 0, 0, SRCCOPY);
+			BitBlt(dc, 0, 0, width, height, win32Context.displayContext(), 0, 0, SRCCOPY);
 			break;
-		case DEGREES180:
+		case ZLView::DEGREES180:
 		{
 			if (myRotator != 0) {
 				delete myRotator;
@@ -142,40 +245,72 @@
 			SIZE size;
 			GetViewportExtEx(dc, &size);
 			SetViewportExtEx(dc, -size.cx, -size.cy, 0);
-			SetViewportOrgEx(dc, width - 1, height + 2 * offset - 1, 0);
-			BitBlt(dc, 0, offset, width + 1, height + 1, win32Context.displayContext(), 0, 0, SRCCOPY);
+			SetViewportOrgEx(dc, width - 1, height - 1, 0);
+			BitBlt(dc, 0, 0, width + 1, height + 1, win32Context.displayContext(), 0, -1, SRCCOPY);
 			break;
 		}
-		case DEGREES90:
-		case DEGREES270:
+		case ZLView::DEGREES90:
+		case ZLView::DEGREES270:
 			if (myRotator == 0) {
-				myRotator = new Rotator(width + 1, height + 1);
+				myRotator = new Rotator(width, height);
 			} else {
-				myRotator->setSize(width + 1, height + 1);
+				myRotator->setSize(width, height);
 			}
 
-			myRotator->setRotation(rotation() == DEGREES90);
+			myRotator->setRotation(rotation() == ZLView::DEGREES90);
 			myRotator->retrieve(win32Context.displayContext(), win32Context.buffer());
 			myRotator->rotate();
-			myRotator->draw(dc, offset);
+			myRotator->draw(dc);
+			break;
+	}
+	EndPaint(myHandle, &paintStructure);
+}
+
+void ZLWin32ViewWidget::rotateXY(int &x, int &y) const {
+	ZLPaintContext &context = view()->context();
+	const int maxX = context.width() - 1;
+	const int maxY = context.height() - 1;
+	switch (rotation()) {
+		case ZLView::DEGREES0:
+			break;
+		case ZLView::DEGREES90:
+		{
+			int tmp = maxX - y;
+			y = x;
+			x = tmp;
 			break;
+		}
+		case ZLView::DEGREES180:
+			x = maxX - x;
+			y = maxY - y;
+			break;
+		case ZLView::DEGREES270:
+		{
+			int tmp = y;
+			y = maxY - x;
+			x = tmp;
+			break;
+		}
 	}
-	EndPaint(window, &paintStructure);
 }
 
 void ZLWin32ViewWidget::onMousePress(int x, int y) {
+	rotateXY(x, y);
 	view()->onStylusPress(x, y);
 }
 
 void ZLWin32ViewWidget::onMouseRelease(int x, int y) {
+	rotateXY(x, y);
 	view()->onStylusRelease(x, y);
 }
 
 void ZLWin32ViewWidget::onMouseMove(int x, int y) {
+	rotateXY(x, y);
 	view()->onStylusMove(x, y);
 }
 
 void ZLWin32ViewWidget::onMouseMovePressed(int x, int y) {
+	rotateXY(x, y);
 	ZLPaintContext &context = view()->context();
 	if (x < 0) {
 		x = 0;
@@ -189,3 +324,66 @@
 	}
 	view()->onStylusMovePressed(x, y);
 }
+
+void ZLWin32ViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+	if (direction == ZLView::VERTICAL) {
+		if (enabled == myVScrollBarIsEnabled) {
+			return;
+		}
+		myVScrollBarIsEnabled = enabled;
+	} else {
+		if (enabled == myHScrollBarIsEnabled) {
+			return;
+		}
+		myHScrollBarIsEnabled = enabled;
+	}
+
+	ShowScrollBar(myHandle, (direction == ZLView::VERTICAL) ? SB_VERT : SB_HORZ, enabled);
+
+	doPaint();
+}
+
+void ZLWin32ViewWidget::setScrollbarPlacement(ZLView::Direction direction, bool standard) {
+	/*
+	int style = GetWindowLong(xxx, GWL_STYLE);
+	if (direction == ZLView::VERTICAL) {
+		xxx 
+	SetWindowLong(myMainWindow, GWL_STYLE, style & ~WS_CAPTION);
+	*/
+}
+
+void ZLWin32ViewWidget::setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to) {
+	if (direction == ZLView::VERTICAL) {
+		if (!myVScrollBarIsEnabled) {
+			return;
+		}
+	} else {
+		if (!myHScrollBarIsEnabled) {
+			return;
+		}
+	}
+
+	SCROLLINFO info;
+	info.cbSize = sizeof(SCROLLINFO);
+	info.fMask = SIF_RANGE | SIF_PAGE | SIF_POS;
+	info.nMin = 0;
+	info.nMax = full;
+	info.nPage = to - from;
+	info.nPos = from;
+	size_t extra = 0;
+	if (info.nPage < full / 20) {
+		extra = full / 20 - info.nPage;
+		info.nPage = full / 20;
+	}
+	info.nMax += extra;
+	if (direction == ZLView::VERTICAL) {
+		myVScrollBarExtra = extra;
+	} else {
+		myHScrollBarExtra = extra;
+	}
+	SetScrollInfo(myHandle, (direction == ZLView::VERTICAL) ? SB_VERT : SB_HORZ, &info, true);
+}
+
+HWND ZLWin32ViewWidget::handle() const {
+	return myHandle;
+}
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/view/ZLWin32ViewWidget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,13 +20,17 @@
 #ifndef __ZLWIN32VIEWWIDGET_H__
 #define __ZLWIN32VIEWWIDGET_H__
 
-#include <ZLView.h>
+#include "../../../../core/src/view/ZLViewWidget.h"
 #include <ZLApplication.h>
 
 #include "../application/ZLWin32ApplicationWindow.h"
 
 class ZLWin32ViewWidget : public ZLViewWidget {
 
+private:
+	typedef LRESULT(CALLBACK *WndProc)(HWND, UINT, WPARAM, LPARAM);
+	static LRESULT CALLBACK ViewWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
 public:
 	ZLWin32ViewWidget(ZLWin32ApplicationWindow &window);
 
@@ -35,14 +39,25 @@
 	void onMouseMove(int x, int y);
 	void onMouseMovePressed(int x, int y);
 
+	HWND handle() const;
+
 private:
 	void repaint();
 	void trackStylus(bool track);
 
+	void setScrollbarEnabled(ZLView::Direction direction, bool enabled);
+	void setScrollbarPlacement(ZLView::Direction direction, bool standard);
+	void setScrollbarParameters(ZLView::Direction direction, size_t full, size_t from, size_t to);
+
 	void doPaint();
 
+	void rotateXY(int &x, int &y) const;
+
+	LRESULT Callback(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
 private:
 	ZLWin32ApplicationWindow &myWindow;
+	HWND myHandle;
 	bool myMouseCaptured;
 
 	class Rotator {
@@ -55,7 +70,7 @@
 		void setRotation(bool counterClockWise);
 		void retrieve(HDC dc, HBITMAP bitmap);
 		void rotate();
-		void draw(HDC dc, int topOffset);
+		void draw(HDC dc);
 
 	private:
 		int myWidth;
@@ -66,8 +81,14 @@
 	};
 
 	Rotator *myRotator;
+		
+	int myHScrollBarExtra;
+	int myVScrollBarExtra;
+
+	bool myHScrollBarIsEnabled;
+	bool myVScrollBarIsEnabled;
 
-friend class ZLWin32ApplicationWindow;
+	WndProc myOriginalCallback;
 };
 
 #endif /* __ZLWIN32VIEWWIDGET_H__ */
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Box.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Box.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Box.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Box.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ColorComboBox.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Container.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Container.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Container.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Container.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Container.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Container.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Container.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Container.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32ControlCollection.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Control.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Control.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Control.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Control.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -444,14 +444,9 @@
 }
 
 void W32LineEditor::setEditable(bool editable) {
-	if (editable) {
-		myStyle &= ~ES_READONLY;
-	} else {
-		myStyle |= ES_READONLY;
-	}
 	if (myWindow != 0) {
 		// TODO: check
-		SetWindowLong(myWindow, GWL_STYLE, myStyle);
+		PostMessage(myWindow, EM_SETREADONLY, !editable, 0);
 	}
 }
 
@@ -500,6 +495,7 @@
 		case WM_GETDLGCODE:
 			return DLGC_WANTALLKEYS;	
 		case WM_KEYDOWN:
+		case WM_SYSKEYDOWN:
 			if (wParam == 0x10) {
 				mask |= 0x1;
 			} else if (wParam == 0x11) {
@@ -511,6 +507,7 @@
 			}
 			return 0;
 		case WM_KEYUP:
+		case WM_SYSKEYUP:
 			if (wParam == 0x10) {
 				mask &= ~0x1;
 			} else if (wParam == 0x11) {
@@ -536,18 +533,13 @@
 }
 
 void W32KeyNameEditor::setEditable(bool editable) {
-	if (editable) {
-		myStyle &= ~ES_READONLY;
-	} else {
-		myStyle |= ES_READONLY;
-	}
 	if (myWindow != 0) {
 		// TODO: check
-		SetWindowLong(myWindow, GWL_STYLE, myStyle);
+		PostMessage(myWindow, EM_SETREADONLY, !editable, 0);
 	}
 }
 
-W32SpinBox::W32SpinBox(WORD min, WORD max, WORD initial) : W32AbstractEditor(ES_NUMBER), myMin(min), myMax(max), myValue(initial) {
+W32SpinBox::W32SpinBox(WORD min, WORD max, WORD initial) : W32AbstractEditor(ES_NUMBER), myMin(min), myMax(max), myValue(initial), myControlWindow(0) {
 }
 
 W32Widget::Size W32SpinBox::minimumSize() const {
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Control.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Control.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Control.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Control.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
  * 02110-1301, USA.
  */
 
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 #include <ZLUnicodeUtil.h>
 
 #include "W32DialogPanel.h"
@@ -96,11 +98,13 @@
 	size += size % 2;
 	myAddress = new WORD[size];
 
+	static const DWORD extendedStyle = ZLLanguageUtil::isRTLLanguage(ZLibrary::Language()) ? WS_EX_LAYOUTRTL : 0;
+
 	WORD *p = myAddress;
 	*p++ = LOWORD(style());
 	*p++ = HIWORD(style());
-	*p++ = 0;
-	*p++ = 0;
+	*p++ = LOWORD(extendedStyle);
+	*p++ = HIWORD(extendedStyle);
 	*p++ = myElement->controlNumber();
 	*p++ = 0; // X
 	*p++ = 0; // Y
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32DialogPanel.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Event.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Event.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Event.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Event.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Event.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Event.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Event.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Event.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32PropertySheet.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #include <windows.h>
 #include <prsht.h>
 
+#include <ZLibrary.h>
+#include <ZLLanguageUtil.h>
 #include <ZLDialogManager.h>
 
 #include "W32DialogPanel.h"
@@ -94,6 +96,10 @@
 int CALLBACK W32PropertySheet::PSCallback(HWND hDialog, UINT message, LPARAM lParam) {
 	if (message == PSCB_INITIALIZED) {
 		SendMessage(hDialog, PSM_CHANGED, 0, 0);
+		if (ZLLanguageUtil::isRTLLanguage(ZLibrary::Language())) {
+			int exStyle = GetWindowLong(hDialog, GWL_EXSTYLE);
+			SetWindowLong(hDialog, GWL_EXSTYLE, exStyle | WS_EX_LAYOUTRTL);
+		}
 	}
 	return 0;
 }
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32StandaloneDialogPanel.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32StandaloneDialogPanel.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32StandaloneDialogPanel.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32StandaloneDialogPanel.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Table.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Table.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Table.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Table.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32TreeView.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32TreeView.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32TreeView.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32TreeView.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32TreeView.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32VBorderBox.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32VBorderBox.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32VBorderBox.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32VBorderBox.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Widget.cpp /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Widget.cpp
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Widget.cpp	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Widget.cpp	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Widget.h /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Widget.h
--- fbreader-0.8.17/zlibrary/ui/src/win32/w32widgets/W32Widget.h	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/ui/src/win32/w32widgets/W32Widget.h	2009-04-30 22:26:45.000000000 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Geometer Plus <contact@geometerplus.com>
+ * Copyright (C) 2007-2009 Geometer Plus <contact@geometerplus.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff -Nru /tmp/y6QFocllrz/fbreader-0.8.17/zlibrary/VERSION /tmp/rHFBPa8T7G/fbreader-0.10.7dfsg/zlibrary/VERSION
--- fbreader-0.8.17/zlibrary/VERSION	2008-03-22 13:00:31.000000000 +0000
+++ fbreader-0.10.7dfsg/zlibrary/VERSION	2009-04-30 22:26:45.000000000 +0100
@@ -1 +1 @@
-0.8.17
+0.10.7